Skip to content

Commit 7f5600b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #892 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 562dbf8 + 909e9d8 commit 7f5600b

File tree

13 files changed

+65
-44
lines changed

13 files changed

+65
-44
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/grpc-ecosystem/grpc-health-probe v0.4.32
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
14-
github.com/onsi/ginkgo/v2 v2.20.2
14+
github.com/onsi/ginkgo/v2 v2.21.0
1515
github.com/openshift/api v3.9.0+incompatible
1616
github.com/operator-framework/api v0.27.0
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
@@ -104,7 +104,7 @@ require (
104104
github.com/google/gnostic-models v0.6.8 // indirect
105105
github.com/google/go-cmp v0.6.0 // indirect
106106
github.com/google/gofuzz v1.2.0 // indirect
107-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
107+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
108108
github.com/google/uuid v1.6.0 // indirect
109109
github.com/gorilla/mux v1.8.1 // indirect
110110
github.com/gorilla/websocket v1.5.0 // indirect
@@ -152,7 +152,7 @@ require (
152152
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
153153
github.com/pkg/errors v0.9.1 // indirect
154154
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
155-
github.com/prometheus/client_golang v1.20.4 // indirect
155+
github.com/prometheus/client_golang v1.20.5 // indirect
156156
github.com/prometheus/client_model v0.6.1 // indirect
157157
github.com/prometheus/common v0.60.0 // indirect
158158
github.com/prometheus/procfs v0.15.1 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,8 +1707,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
17071707
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
17081708
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
17091709
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
1710-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
1711-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
1710+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
1711+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
17121712
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
17131713
github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
17141714
github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1953,8 +1953,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
19531953
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
19541954
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
19551955
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
1956-
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
1957-
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
1956+
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
1957+
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
19581958
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
19591959
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
19601960
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
@@ -1995,8 +1995,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
19951995
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
19961996
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
19971997
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
1998-
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
1999-
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
1998+
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
1999+
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
20002000
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
20012001
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
20022002
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

‎staging/operator-lifecycle-manager/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ require (
1717
github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0
1818
github.com/mitchellh/hashstructure v1.1.0
1919
github.com/mitchellh/mapstructure v1.5.0
20-
github.com/onsi/ginkgo/v2 v2.20.2
20+
github.com/onsi/ginkgo/v2 v2.21.0
2121
github.com/onsi/gomega v1.34.2
2222
github.com/openshift/api v3.9.0+incompatible
2323
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
2424
github.com/operator-framework/api v0.27.0
2525
github.com/operator-framework/operator-registry v1.47.0
2626
github.com/otiai10/copy v1.14.0
2727
github.com/pkg/errors v0.9.1
28-
github.com/prometheus/client_golang v1.20.4
28+
github.com/prometheus/client_golang v1.20.5
2929
github.com/prometheus/client_model v0.6.1
3030
github.com/prometheus/common v0.60.0
3131
github.com/sirupsen/logrus v1.9.3
@@ -105,7 +105,7 @@ require (
105105
github.com/google/cel-go v0.20.1 // indirect
106106
github.com/google/gnostic-models v0.6.8 // indirect
107107
github.com/google/gofuzz v1.2.0 // indirect
108-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
108+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
109109
github.com/google/uuid v1.6.0 // indirect
110110
github.com/gorilla/mux v1.8.1 // indirect
111111
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect

‎staging/operator-lifecycle-manager/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,8 +1630,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
16301630
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
16311631
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
16321632
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
1633-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
1634-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
1633+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
1634+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
16351635
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
16361636
github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
16371637
github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1808,8 +1808,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
18081808
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
18091809
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
18101810
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
1811-
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
1812-
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
1811+
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
1812+
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
18131813
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
18141814
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
18151815
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -1846,8 +1846,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
18461846
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
18471847
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
18481848
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1849-
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
1850-
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
1849+
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
1850+
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
18511851
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
18521852
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
18531853
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=

‎vendor/github.com/google/pprof/profile/encode.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/pprof/profile/merge.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/pprof/profile/profile.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/onsi/ginkgo/v2/formatter/formatter.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/onsi/ginkgo/v2/types/config.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/onsi/ginkgo/v2/types/types.go

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/onsi/ginkgo/v2/types/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/prometheus/client_golang/prometheus/testutil/testutil.go

Lines changed: 12 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ github.com/google/go-cmp/cmp/internal/value
397397
## explicit; go 1.12
398398
github.com/google/gofuzz
399399
github.com/google/gofuzz/bytesource
400-
# github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5
400+
# github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db
401401
## explicit; go 1.22
402402
github.com/google/pprof/profile
403403
# github.com/google/uuid v1.6.0
@@ -558,8 +558,8 @@ github.com/munnerz/goautoneg
558558
# github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
559559
## explicit
560560
github.com/mxk/go-flowrate/flowrate
561-
# github.com/onsi/ginkgo/v2 v2.20.2
562-
## explicit; go 1.22
561+
# github.com/onsi/ginkgo/v2 v2.21.0
562+
## explicit; go 1.22.0
563563
github.com/onsi/ginkgo/v2/config
564564
github.com/onsi/ginkgo/v2/formatter
565565
github.com/onsi/ginkgo/v2/ginkgo
@@ -786,7 +786,7 @@ github.com/pkg/errors
786786
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
787787
## explicit
788788
github.com/pmezard/go-difflib/difflib
789-
# github.com/prometheus/client_golang v1.20.4
789+
# github.com/prometheus/client_golang v1.20.5
790790
## explicit; go 1.20
791791
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
792792
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil/header

0 commit comments

Comments
 (0)