Skip to content

Commit 6dd1017

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#964 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents d382006 + cdf5b57 commit 6dd1017

File tree

431 files changed

+7512
-4457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

431 files changed

+7512
-4457
lines changed

‎go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ require (
1010
github.com/go-logr/logr v1.4.2
1111
github.com/golang/mock v1.6.0
1212
github.com/googleapis/gnostic v0.5.5
13-
github.com/grpc-ecosystem/grpc-health-probe v0.4.34
13+
github.com/grpc-ecosystem/grpc-health-probe v0.4.37
1414
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
1515
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1616
github.com/onsi/ginkgo/v2 v2.22.2
1717
github.com/openshift/api v3.9.0+incompatible
1818
github.com/operator-framework/api v0.29.0
1919
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
20-
github.com/operator-framework/operator-registry v1.50.0
20+
github.com/operator-framework/operator-registry v1.51.0
2121
github.com/sirupsen/logrus v1.9.3
2222
github.com/spf13/cobra v1.9.1
2323
github.com/stretchr/testify v1.10.0
2424
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
25-
google.golang.org/protobuf v1.36.2
25+
google.golang.org/protobuf v1.36.5
2626
gopkg.in/yaml.v2 v2.4.0
2727
k8s.io/api v0.32.2
2828
k8s.io/apimachinery v0.32.2
@@ -41,7 +41,7 @@ require (
4141
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
4242

4343
require (
44-
cel.dev/expr v0.18.0 // indirect
44+
cel.dev/expr v0.19.0 // indirect
4545
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4646
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4747
github.com/BurntSushi/toml v1.4.0 // indirect
@@ -59,13 +59,13 @@ require (
5959
github.com/containerd/containerd v1.7.25 // indirect
6060
github.com/containerd/containerd/api v1.8.0 // indirect
6161
github.com/containerd/continuity v0.4.4 // indirect
62-
github.com/containerd/errdefs v0.3.0 // indirect
62+
github.com/containerd/errdefs v1.0.0 // indirect
6363
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6464
github.com/containerd/log v0.1.0 // indirect
6565
github.com/containerd/platforms v0.2.1 // indirect
6666
github.com/containerd/ttrpc v1.2.5 // indirect
6767
github.com/containerd/typeurl/v2 v2.2.3 // indirect
68-
github.com/containers/common v0.61.0 // indirect
68+
github.com/containers/common v0.62.0 // indirect
6969
github.com/containers/image/v5 v5.34.0 // indirect
7070
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7171
github.com/containers/ocicrypt v1.2.1 // indirect
@@ -74,7 +74,7 @@ require (
7474
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7575
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7676
github.com/distribution/reference v0.6.0 // indirect
77-
github.com/docker/cli v27.5.1+incompatible // indirect
77+
github.com/docker/cli v28.0.0+incompatible // indirect
7878
github.com/docker/distribution v2.8.3+incompatible // indirect
7979
github.com/docker/docker v27.5.1+incompatible // indirect
8080
github.com/docker/docker-credential-helpers v0.8.2 // indirect
@@ -101,21 +101,21 @@ require (
101101
github.com/gobuffalo/flect v1.0.3 // indirect
102102
github.com/goccy/go-yaml v1.11.0 // indirect
103103
github.com/gogo/protobuf v1.3.2 // indirect
104-
github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
104+
github.com/golang-migrate/migrate/v4 v4.18.2 // indirect
105105
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
106106
github.com/golang/protobuf v1.5.4 // indirect
107107
github.com/google/btree v1.1.3 // indirect
108108
github.com/google/cel-go v0.22.1 // indirect
109109
github.com/google/gnostic-models v0.6.8 // indirect
110-
github.com/google/go-cmp v0.6.0 // indirect
110+
github.com/google/go-cmp v0.7.0 // indirect
111111
github.com/google/gofuzz v1.2.0 // indirect
112112
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
113113
github.com/google/uuid v1.6.0 // indirect
114114
github.com/gorilla/mux v1.8.1 // indirect
115115
github.com/gorilla/websocket v1.5.0 // indirect
116-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
116+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
117117
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
118-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
118+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
119119
github.com/h2non/filetype v1.1.3 // indirect
120120
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
121121
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -164,31 +164,31 @@ require (
164164
github.com/prometheus/procfs v0.15.1 // indirect
165165
github.com/russross/blackfriday/v2 v2.1.0 // indirect
166166
github.com/spf13/pflag v1.0.6 // indirect
167-
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
167+
github.com/spiffe/go-spiffe/v2 v2.4.0 // indirect
168168
github.com/stoewer/go-strcase v1.3.0 // indirect
169169
github.com/tidwall/btree v1.7.0 // indirect
170170
github.com/x448/float16 v0.8.4 // indirect
171171
github.com/zeebo/errs v1.3.0 // indirect
172-
go.etcd.io/bbolt v1.3.11 // indirect
172+
go.etcd.io/bbolt v1.4.0 // indirect
173173
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
174174
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
175175
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
176176
go.opencensus.io v0.24.0 // indirect
177177
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
178-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
179-
go.opentelemetry.io/otel v1.31.0 // indirect
180-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 // indirect
182-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
183-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
184-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
178+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
179+
go.opentelemetry.io/otel v1.32.0 // indirect
180+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
181+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
182+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
183+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
184+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
185185
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
186186
go.uber.org/multierr v1.11.0 // indirect
187187
go.uber.org/zap v1.27.0 // indirect
188188
golang.org/x/crypto v0.33.0 // indirect
189-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
189+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
190190
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
191-
golang.org/x/mod v0.22.0 // indirect
191+
golang.org/x/mod v0.23.0 // indirect
192192
golang.org/x/net v0.35.0 // indirect
193193
golang.org/x/oauth2 v0.25.0 // indirect
194194
golang.org/x/sync v0.11.0 // indirect
@@ -200,9 +200,9 @@ require (
200200
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
201201
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
202202
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
203-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
203+
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
204204
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
205-
google.golang.org/grpc v1.69.4 // indirect
205+
google.golang.org/grpc v1.70.0 // indirect
206206
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
207207
gopkg.in/inf.v0 v0.9.1 // indirect
208208
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

0 commit comments

Comments
 (0)