Skip to content

Commit 7ff5cb5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1129 from anik120/sync-upstream-with-bug-fix
OCPBUGS-59768: Synchronize From Upstream Repositories
2 parents a0b88f9 + 6e79ccc commit 7ff5cb5

File tree

1,342 files changed

+114315
-49996
lines changed

Some content is hidden

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

1,342 files changed

+114315
-49996
lines changed

‎go.mod‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,27 @@ require (
1111
github.com/grpc-ecosystem/grpc-health-probe v0.4.40
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.12.0
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
14-
github.com/onsi/ginkgo/v2 v2.25.3
15-
github.com/openshift/api v3.9.0+incompatible
16-
github.com/operator-framework/api v0.34.0
14+
github.com/onsi/ginkgo/v2 v2.26.0
15+
github.com/openshift/api v0.0.0-20251023193535-8691c3014652
16+
github.com/operator-framework/api v0.35.0
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
18-
github.com/operator-framework/operator-registry v1.59.0
18+
github.com/operator-framework/operator-registry v1.60.0
1919
github.com/sirupsen/logrus v1.9.3
2020
github.com/spf13/cobra v1.10.1
2121
github.com/stretchr/testify v1.11.1
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
23-
google.golang.org/protobuf v1.36.9
23+
google.golang.org/protobuf v1.36.10
2424
gopkg.in/yaml.v2 v2.4.0
25-
k8s.io/api v0.33.4
26-
k8s.io/apimachinery v0.33.4
27-
k8s.io/client-go v0.33.4
28-
k8s.io/code-generator v0.33.4
29-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
25+
k8s.io/api v0.34.1
26+
k8s.io/apimachinery v0.34.1
27+
k8s.io/client-go v0.34.1
28+
k8s.io/code-generator v0.34.1
29+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
3030
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
31-
sigs.k8s.io/controller-runtime v0.21.0
32-
sigs.k8s.io/controller-tools v0.18.0
31+
sigs.k8s.io/controller-runtime v0.22.3
32+
sigs.k8s.io/controller-tools v0.19.0
3333
)
3434

35-
// latest gRPC library causes changes in the way the CatalogSource connection status behaves
36-
// previously it would reach READY - but now seems to stay on IDLE unless there is data going down the pipe
37-
// this is breaking many CatalogSource related tests
38-
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
39-
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
40-
4135
require (
4236
cel.dev/expr v0.24.0 // indirect
4337
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
@@ -72,10 +66,10 @@ require (
7266
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
7367
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7468
github.com/distribution/reference v0.6.0 // indirect
75-
github.com/docker/cli v28.4.0+incompatible // indirect
69+
github.com/docker/cli v28.5.1+incompatible // indirect
7670
github.com/docker/distribution v2.8.3+incompatible // indirect
77-
github.com/docker/docker v28.3.3+incompatible // indirect
78-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
71+
github.com/docker/docker v28.5.1+incompatible // indirect
72+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
7973
github.com/docker/go-connections v0.6.0 // indirect
8074
github.com/docker/go-units v0.5.0 // indirect
8175
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
@@ -84,27 +78,27 @@ require (
8478
github.com/fatih/color v1.18.0 // indirect
8579
github.com/felixge/httpsnoop v1.0.4 // indirect
8680
github.com/fsnotify/fsnotify v1.9.0 // indirect
87-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
81+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
8882
github.com/go-air/gini v1.0.4 // indirect
8983
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9084
github.com/go-git/go-billy/v5 v5.6.2 // indirect
9185
github.com/go-git/go-git/v5 v5.16.2 // indirect
92-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
86+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
9387
github.com/go-logr/stdr v1.2.2 // indirect
9488
github.com/go-logr/zapr v1.3.0 // indirect
9589
github.com/go-openapi/jsonpointer v0.21.1 // indirect
9690
github.com/go-openapi/jsonreference v0.21.0 // indirect
9791
github.com/go-openapi/swag v0.23.1 // indirect
9892
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9993
github.com/gobuffalo/flect v1.0.3 // indirect
100-
github.com/goccy/go-yaml v1.11.0 // indirect
94+
github.com/goccy/go-yaml v1.18.0 // indirect
10195
github.com/gogo/protobuf v1.3.2 // indirect
10296
github.com/golang-migrate/migrate/v4 v4.19.0 // indirect
10397
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
10498
github.com/golang/protobuf v1.5.4 // indirect
10599
github.com/google/btree v1.1.3 // indirect
106-
github.com/google/cel-go v0.26.0 // indirect
107-
github.com/google/gnostic-models v0.6.9 // indirect
100+
github.com/google/cel-go v0.26.1 // indirect
101+
github.com/google/gnostic-models v0.7.0 // indirect
108102
github.com/google/go-cmp v0.7.0 // indirect
109103
github.com/google/go-containerregistry v0.20.6 // indirect
110104
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
@@ -147,7 +141,7 @@ require (
147141
github.com/moby/sys/userns v0.1.0 // indirect
148142
github.com/moby/term v0.5.2 // indirect
149143
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
150-
github.com/modern-go/reflect2 v1.0.2 // indirect
144+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
151145
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
152146
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
153147
github.com/onsi/gomega v1.38.2 // indirect
@@ -162,7 +156,7 @@ require (
162156
github.com/proglottis/gpgme v0.1.5 // indirect
163157
github.com/prometheus/client_golang v1.23.2 // indirect
164158
github.com/prometheus/client_model v0.6.2 // indirect
165-
github.com/prometheus/common v0.66.1 // indirect
159+
github.com/prometheus/common v0.67.1 // indirect
166160
github.com/prometheus/procfs v0.16.1 // indirect
167161
github.com/rivo/uniseg v0.4.7 // indirect
168162
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -183,9 +177,9 @@ require (
183177
github.com/x448/float16 v0.8.4 // indirect
184178
github.com/zeebo/errs v1.4.0 // indirect
185179
go.etcd.io/bbolt v1.4.3 // indirect
186-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
187-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
188-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
180+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
181+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
182+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
189183
go.opencensus.io v0.24.0 // indirect
190184
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
191185
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
@@ -198,60 +192,58 @@ require (
198192
go.opentelemetry.io/otel/trace v1.37.0 // indirect
199193
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
200194
go.podman.io/common v0.65.0 // indirect
201-
go.podman.io/image/v5 v5.37.0 // indirect
202-
go.podman.io/storage v1.60.0 // indirect
195+
go.podman.io/image/v5 v5.38.0 // indirect
196+
go.podman.io/storage v1.61.0 // indirect
203197
go.uber.org/automaxprocs v1.6.0 // indirect
204198
go.uber.org/multierr v1.11.0 // indirect
205199
go.uber.org/zap v1.27.0 // indirect
206-
go.yaml.in/yaml/v2 v2.4.2 // indirect
207-
golang.org/x/crypto v0.42.0 // indirect
200+
go.yaml.in/yaml/v2 v2.4.3 // indirect
201+
go.yaml.in/yaml/v3 v3.0.4 // indirect
202+
golang.org/x/crypto v0.43.0 // indirect
208203
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
209204
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
210-
golang.org/x/mod v0.28.0 // indirect
211-
golang.org/x/net v0.44.0 // indirect
212-
golang.org/x/oauth2 v0.30.0 // indirect
205+
golang.org/x/mod v0.29.0 // indirect
206+
golang.org/x/net v0.46.0 // indirect
207+
golang.org/x/oauth2 v0.32.0 // indirect
213208
golang.org/x/sync v0.17.0 // indirect
214-
golang.org/x/sys v0.36.0 // indirect
215-
golang.org/x/term v0.35.0 // indirect
216-
golang.org/x/text v0.29.0 // indirect
217-
golang.org/x/time v0.13.0 // indirect
218-
golang.org/x/tools v0.36.0 // indirect
209+
golang.org/x/sys v0.37.0 // indirect
210+
golang.org/x/term v0.36.0 // indirect
211+
golang.org/x/text v0.30.0 // indirect
212+
golang.org/x/time v0.14.0 // indirect
213+
golang.org/x/tools v0.38.0 // indirect
219214
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
220-
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
221215
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
222216
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
223-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
224-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
225-
google.golang.org/grpc v1.75.1 // indirect
217+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
219+
google.golang.org/grpc v1.76.0 // indirect
226220
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
227221
gopkg.in/inf.v0 v0.9.1 // indirect
228222
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
229223
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
230224
gopkg.in/warnings.v0 v0.1.2 // indirect
231225
gopkg.in/yaml.v3 v3.0.1 // indirect
232-
k8s.io/apiextensions-apiserver v0.33.4 // indirect
233-
k8s.io/apiserver v0.33.4 // indirect
226+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
227+
k8s.io/apiserver v0.34.1 // indirect
234228
k8s.io/cli-runtime v0.33.2 // indirect
235-
k8s.io/component-base v0.33.4 // indirect
236-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
229+
k8s.io/component-base v0.34.1 // indirect
230+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
237231
k8s.io/klog v1.0.0 // indirect
238232
k8s.io/klog/v2 v2.130.1 // indirect
239-
k8s.io/kms v0.33.4 // indirect
240-
k8s.io/kube-aggregator v0.33.4 // indirect
233+
k8s.io/kms v0.34.1 // indirect
234+
k8s.io/kube-aggregator v0.34.1 // indirect
241235
k8s.io/kubectl v0.33.2 // indirect
242236
oras.land/oras-go/v2 v2.6.0 // indirect
243237
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
244238
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
245239
sigs.k8s.io/randfill v1.0.0 // indirect
246-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
240+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
247241
sigs.k8s.io/yaml v1.6.0 // indirect
248242
)
249243

250244
replace (
251245
// pinned because of incompatibility with k8s.io/apiserver
252246
github.com/google/cel-go => github.com/google/cel-go v0.22.1
253-
// controller runtime
254-
github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
255247
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
256248

257249
// use staged repositories

0 commit comments

Comments
 (0)