Skip to content

Commit d9496b7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1151 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents db55b14 + adc328a commit d9496b7

File tree

44 files changed

+1079
-7092
lines changed

Some content is hidden

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

44 files changed

+1079
-7092
lines changed

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.12.0
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1414
github.com/onsi/ginkgo/v2 v2.27.2
15-
github.com/openshift/api v0.0.0-20251023193535-8691c3014652
15+
github.com/openshift/api v0.0.0-20251111193948-50e2ece149d7
1616
github.com/operator-framework/api v0.36.0
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
1818
github.com/operator-framework/operator-registry v1.61.0
@@ -26,8 +26,8 @@ require (
2626
k8s.io/apimachinery v0.34.1
2727
k8s.io/client-go v0.34.1
2828
k8s.io/code-generator v0.34.1
29-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
30-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
29+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
30+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3131
sigs.k8s.io/controller-runtime v0.22.4
3232
sigs.k8s.io/controller-tools v0.19.0
3333
)
@@ -148,7 +148,7 @@ require (
148148
github.com/opencontainers/go-digest v1.0.0 // indirect
149149
github.com/opencontainers/image-spec v1.1.1 // indirect
150150
github.com/opencontainers/runtime-spec v1.2.1 // indirect
151-
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
151+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 // indirect
152152
github.com/otiai10/copy v1.14.1 // indirect
153153
github.com/otiai10/mint v1.6.3 // indirect
154154
github.com/pkg/errors v0.9.1 // indirect
@@ -197,16 +197,16 @@ require (
197197
go.uber.org/zap v1.27.0 // indirect
198198
go.yaml.in/yaml/v2 v2.4.3 // indirect
199199
go.yaml.in/yaml/v3 v3.0.4 // indirect
200-
golang.org/x/crypto v0.43.0 // indirect
200+
golang.org/x/crypto v0.44.0 // indirect
201201
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
202202
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
203203
golang.org/x/mod v0.29.0 // indirect
204-
golang.org/x/net v0.46.0 // indirect
204+
golang.org/x/net v0.47.0 // indirect
205205
golang.org/x/oauth2 v0.32.0 // indirect
206206
golang.org/x/sync v0.18.0 // indirect
207207
golang.org/x/sys v0.38.0 // indirect
208-
golang.org/x/term v0.36.0 // indirect
209-
golang.org/x/text v0.30.0 // indirect
208+
golang.org/x/term v0.37.0 // indirect
209+
golang.org/x/text v0.31.0 // indirect
210210
golang.org/x/time v0.14.0 // indirect
211211
golang.org/x/tools v0.38.0 // indirect
212212
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgr
479479
github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU8lpJfSlR0xww=
480480
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
481481
github.com/openshift/api v0.0.0-20200326152221-912866ddb162/go.mod h1:RKMJ5CBnljLfnej+BJ/xnOWc3kZDvJUaIAEq2oKSPtE=
482-
github.com/openshift/api v0.0.0-20251023193535-8691c3014652 h1:iFo7XEz9/q6qxZey/MCCBTqCC88DXbtUz7mUWtGkQzg=
483-
github.com/openshift/api v0.0.0-20251023193535-8691c3014652/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
482+
github.com/openshift/api v0.0.0-20251111193948-50e2ece149d7 h1:MemawsK6SpxEaE5y0NqO5sIX3yTLIIyP89w6DGKukAk=
483+
github.com/openshift/api v0.0.0-20251111193948-50e2ece149d7/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
484484
github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
485485
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 h1:kMiuiZXH1GdfbiMwsuAQOqGaMxlo9NCUk0wT4XAdfNM=
486486
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0/go.mod h1:uUQ4LClRO+fg5MF/P6QxjMCb1C9f7Oh4RKepftDnEJE=
@@ -723,8 +723,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
723723
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
724724
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
725725
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
726-
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
727-
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
726+
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
727+
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
728728
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
729729
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
730730
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
@@ -774,8 +774,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
774774
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
775775
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
776776
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
777-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
778-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
777+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
778+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
779779
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
780780
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
781781
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -842,8 +842,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
842842
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
843843
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
844844
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
845-
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
846-
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
845+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
846+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
847847
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
848848
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
849849
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -856,8 +856,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
856856
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
857857
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
858858
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
859-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
860-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
859+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
860+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
861861
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
862862
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
863863
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
@@ -1013,13 +1013,13 @@ k8s.io/kms v0.34.1/go.mod h1:s1CFkLG7w9eaTYvctOxosx88fl4spqmixnNpys0JAtM=
10131013
k8s.io/kube-aggregator v0.34.1 h1:WNLV0dVNoFKmuyvdWLd92iDSyD/TSTjqwaPj0U9XAEU=
10141014
k8s.io/kube-aggregator v0.34.1/go.mod h1:RU8j+5ERfp0h+gIvWtxRPfsa5nK7rboDm8RST8BJfYQ=
10151015
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
1016-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
1017-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
1016+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
1017+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
10181018
k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
10191019
k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
10201020
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
1021-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
1022-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1021+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
1022+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
10231023
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
10241024
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
10251025
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 h1:qPrZsv1cwQiFeieFlRqT627fVZ+tyfou/+S5S0H5ua0=

‎staging/operator-lifecycle-manager/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,16 @@ e2e-local-deploy: $(KIND) $(HELM) #HELP Deploy OLM for e2e testing (without cert
319319
#SECTION Code Generation
320320

321321
.PHONY: gen-all #HELP Update OLM API, generate code and mocks
322-
gen-all: manifests codegen mockgen
322+
gen-all: manifests openshift-test-crds codegen mockgen
323323

324324
.PHONY: manifests
325325
manifests: vendor #HELP Copy OLM API CRD manifests to deploy/chart/crds
326326
./scripts/copy_crds.sh
327327

328+
.PHONY: openshift-test-crds
329+
openshift-test-crds: #HELP Generate OpenShift CRDs for openshift controller unit tests (ClusterOperator, ClusterVersion)
330+
./scripts/generate_openshift_crds.sh
331+
328332
.PHONY: codegen
329333
codegen: #HELP Generate clients, deepcopy, listers, and informers
330334
./scripts/update_codegen.sh

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ require (
1919
github.com/mitchellh/mapstructure v1.5.0
2020
github.com/onsi/ginkgo/v2 v2.27.2
2121
github.com/onsi/gomega v1.38.2
22-
github.com/openshift/api v0.0.0-20221021112143-4226c2167e40
23-
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
22+
github.com/openshift/api v0.0.0-20251111193948-50e2ece149d7
23+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
2424
github.com/operator-framework/api v0.36.0
2525
github.com/operator-framework/operator-registry v1.61.0
2626
github.com/otiai10/copy v1.14.1
@@ -33,7 +33,7 @@ require (
3333
github.com/spf13/pflag v1.0.10
3434
github.com/stretchr/testify v1.11.1
3535
go.podman.io/image/v5 v5.38.0
36-
golang.org/x/net v0.46.0
36+
golang.org/x/net v0.47.0
3737
golang.org/x/sync v0.18.0
3838
golang.org/x/time v0.14.0
3939
google.golang.org/grpc v1.76.0
@@ -48,8 +48,8 @@ require (
4848
k8s.io/klog v1.0.0
4949
k8s.io/klog/v2 v2.130.1
5050
k8s.io/kube-aggregator v0.34.1
51-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
52-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
51+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
52+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
5353
sigs.k8s.io/controller-runtime v0.22.4
5454
sigs.k8s.io/controller-tools v0.19.0
5555
)
@@ -91,7 +91,6 @@ require (
9191
github.com/fatih/color v1.18.0 // indirect
9292
github.com/felixge/httpsnoop v1.0.4 // indirect
9393
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
94-
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
9594
github.com/go-logr/stdr v1.2.2 // indirect
9695
github.com/go-logr/zapr v1.3.0 // indirect
9796
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -106,7 +105,7 @@ require (
106105
github.com/google/btree v1.1.3 // indirect
107106
github.com/google/cel-go v0.26.1 // indirect
108107
github.com/google/gnostic-models v0.7.0 // indirect
109-
github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
108+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
110109
github.com/google/uuid v1.6.0 // indirect
111110
github.com/gorilla/mux v1.8.1 // indirect
112111
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -161,18 +160,18 @@ require (
161160
go.uber.org/zap v1.27.0 // indirect
162161
go.yaml.in/yaml/v2 v2.4.3 // indirect
163162
go.yaml.in/yaml/v3 v3.0.4 // indirect
164-
golang.org/x/crypto v0.43.0 // indirect
163+
golang.org/x/crypto v0.44.0 // indirect
165164
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
166165
golang.org/x/mod v0.29.0 // indirect
167166
golang.org/x/oauth2 v0.32.0 // indirect
168167
golang.org/x/sys v0.38.0 // indirect
169-
golang.org/x/term v0.36.0 // indirect
170-
golang.org/x/text v0.30.0 // indirect
168+
golang.org/x/term v0.37.0 // indirect
169+
golang.org/x/text v0.31.0 // indirect
171170
golang.org/x/tools v0.38.0 // indirect
172171
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
173172
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
174173
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
175-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251110190251-83f479183930 // indirect
174+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
176175
google.golang.org/protobuf v1.36.10 // indirect
177176
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
178177
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)