Skip to content

Commit e449ed4

Browse files
Merge pull request #1038 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 04ad98b + 9e461a9 commit e449ed4

File tree

955 files changed

+61095
-14631
lines changed

Some content is hidden

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

955 files changed

+61095
-14631
lines changed

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ require (
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
2323
google.golang.org/protobuf v1.36.6
2424
gopkg.in/yaml.v2 v2.4.0
25-
k8s.io/api v0.32.3
26-
k8s.io/apimachinery v0.32.3
27-
k8s.io/client-go v0.32.3
28-
k8s.io/code-generator v0.32.3
29-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
25+
k8s.io/api v0.33.2
26+
k8s.io/apimachinery v0.33.2
27+
k8s.io/client-go v0.33.2
28+
k8s.io/code-generator v0.33.2
29+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
3030
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
31-
sigs.k8s.io/controller-runtime v0.20.4
32-
sigs.k8s.io/controller-tools v0.17.2
31+
sigs.k8s.io/controller-runtime v0.21.0
32+
sigs.k8s.io/controller-tools v0.18.0
3333
)
3434

3535
// latest gRPC library causes changes in the way the CatalogSource connection status behaves
@@ -114,14 +114,13 @@ require (
114114
github.com/golang/protobuf v1.5.4 // indirect
115115
github.com/google/btree v1.1.3 // indirect
116116
github.com/google/cel-go v0.25.0 // indirect
117-
github.com/google/gnostic-models v0.6.8 // indirect
117+
github.com/google/gnostic-models v0.6.9 // indirect
118118
github.com/google/go-cmp v0.7.0 // indirect
119119
github.com/google/go-containerregistry v0.20.3 // indirect
120-
github.com/google/gofuzz v1.2.0 // indirect
121120
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
122121
github.com/google/uuid v1.6.0 // indirect
123122
github.com/gorilla/mux v1.8.1 // indirect
124-
github.com/gorilla/websocket v1.5.0 // indirect
123+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
125124
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
126125
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
127126
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
@@ -196,17 +195,17 @@ require (
196195
github.com/x448/float16 v0.8.4 // indirect
197196
github.com/zeebo/errs v1.4.0 // indirect
198197
go.etcd.io/bbolt v1.4.0 // indirect
199-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
200-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
201-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
198+
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
199+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
200+
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
202201
go.mongodb.org/mongo-driver v1.14.0 // indirect
203202
go.opencensus.io v0.24.0 // indirect
204203
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
205204
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
206205
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
207206
go.opentelemetry.io/otel v1.34.0 // indirect
208207
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
209-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
208+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
210209
go.opentelemetry.io/otel/metric v1.34.0 // indirect
211210
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
212211
go.opentelemetry.io/otel/trace v1.34.0 // indirect
@@ -238,20 +237,21 @@ require (
238237
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
239238
gopkg.in/warnings.v0 v0.1.2 // indirect
240239
gopkg.in/yaml.v3 v3.0.1 // indirect
241-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
242-
k8s.io/apiserver v0.32.3 // indirect
240+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
241+
k8s.io/apiserver v0.33.2 // indirect
243242
k8s.io/cli-runtime v0.32.0 // indirect
244-
k8s.io/component-base v0.32.3 // indirect
245-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
243+
k8s.io/component-base v0.33.2 // indirect
244+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
246245
k8s.io/klog v1.0.0 // indirect
247246
k8s.io/klog/v2 v2.130.1 // indirect
248-
k8s.io/kms v0.32.3 // indirect
249-
k8s.io/kube-aggregator v0.32.3 // indirect
247+
k8s.io/kms v0.33.2 // indirect
248+
k8s.io/kube-aggregator v0.33.2 // indirect
250249
k8s.io/kubectl v0.32.0 // indirect
251250
oras.land/oras-go/v2 v2.6.0 // indirect
252-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
251+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
253252
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
254-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
253+
sigs.k8s.io/randfill v1.0.0 // indirect
254+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
255255
sigs.k8s.io/yaml v1.4.0 // indirect
256256
)
257257

go.sum

Lines changed: 55 additions & 50 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"
@@ -367,7 +367,6 @@ spec:
367367
pod labels will be ignored. The default value is empty.
368368
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
369369
Also, matchLabelKeys cannot be set when labelSelector isn't set.
370-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
371370
type: array
372371
items:
373372
type: string
@@ -382,7 +381,6 @@ spec:
382381
pod labels will be ignored. The default value is empty.
383382
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
384383
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
385-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
386384
type: array
387385
items:
388386
type: string
@@ -539,7 +537,6 @@ spec:
539537
pod labels will be ignored. The default value is empty.
540538
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
541539
Also, matchLabelKeys cannot be set when labelSelector isn't set.
542-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
543540
type: array
544541
items:
545542
type: string
@@ -554,7 +551,6 @@ spec:
554551
pod labels will be ignored. The default value is empty.
555552
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
556553
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
557-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
558554
type: array
559555
items:
560556
type: string
@@ -712,7 +708,6 @@ spec:
712708
pod labels will be ignored. The default value is empty.
713709
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
714710
Also, matchLabelKeys cannot be set when labelSelector isn't set.
715-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
716711
type: array
717712
items:
718713
type: string
@@ -727,7 +722,6 @@ spec:
727722
pod labels will be ignored. The default value is empty.
728723
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
729724
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
730-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
731725
type: array
732726
items:
733727
type: string
@@ -884,7 +878,6 @@ spec:
884878
pod labels will be ignored. The default value is empty.
885879
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
886880
Also, matchLabelKeys cannot be set when labelSelector isn't set.
887-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
888881
type: array
889882
items:
890883
type: string
@@ -899,7 +892,6 @@ spec:
899892
pod labels will be ignored. The default value is empty.
900893
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
901894
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
902-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
903895
type: array
904896
items:
905897
type: string

0 commit comments

Comments
 (0)