Skip to content

Commit 20d0880

Browse files
camilamacedo86camilamacedo86
authored
✨ upgrade controller-runtime and k8s dependencies to support k8s 1.33 (operator-framework#2038)
* Upgrade go version, controller-runtime and k8s dependencies to support k8s 1.33 * Update hack/ci to use go 1.24.3 and latest version in the testdata * Update go version from 1.23 to 1.24 in the tilt
1 parent 10d8d79 commit 20d0880

File tree

6 files changed

+106
-106
lines changed

6 files changed

+106
-106
lines changed

‎.tilt-support

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def deploy_cert_manager_if_needed():
1414
docker_build(
1515
ref='helper',
1616
context='.',
17-
build_args={'GO_VERSION': '1.23'},
17+
build_args={'GO_VERSION': '1.24'},
1818
dockerfile_contents='''
1919
ARG GO_VERSION
2020
FROM golang:${GO_VERSION}

‎go.mod

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/operator-framework/operator-controller
22

3-
go 1.23.4
3+
go 1.24.3
44

55
require (
66
github.com/BurntSushi/toml v1.5.0
@@ -32,24 +32,24 @@ require (
3232
golang.org/x/tools v0.34.0
3333
gopkg.in/yaml.v2 v2.4.0
3434
helm.sh/helm/v3 v3.17.3
35-
k8s.io/api v0.32.3
36-
k8s.io/apiextensions-apiserver v0.32.3
37-
k8s.io/apimachinery v0.32.3
38-
k8s.io/apiserver v0.32.3
39-
k8s.io/cli-runtime v0.32.3
40-
k8s.io/client-go v0.32.3
41-
k8s.io/component-base v0.32.3
35+
k8s.io/api v0.33.2
36+
k8s.io/apiextensions-apiserver v0.33.2
37+
k8s.io/apimachinery v0.33.2
38+
k8s.io/apiserver v0.33.2
39+
k8s.io/cli-runtime v0.33.2
40+
k8s.io/client-go v0.33.2
41+
k8s.io/component-base v0.33.2
4242
k8s.io/klog/v2 v2.130.1
43-
k8s.io/kubernetes v1.32.3
44-
k8s.io/utils v0.0.0-20241210054802-24370beab758
45-
sigs.k8s.io/controller-runtime v0.20.4
43+
k8s.io/kubernetes v1.33.2
44+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
45+
sigs.k8s.io/controller-runtime v0.21.0
4646
sigs.k8s.io/controller-tools v0.17.3
4747
sigs.k8s.io/yaml v1.4.0
4848
)
4949

5050
require (
51-
k8s.io/component-helpers v0.32.3 // indirect
52-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
51+
k8s.io/component-helpers v0.33.2 // indirect
52+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
5353
)
5454

5555
require (
@@ -128,12 +128,11 @@ require (
128128
github.com/google/btree v1.1.3 // indirect
129129
github.com/google/cel-go v0.25.0 // indirect
130130
github.com/google/gnostic-models v0.6.9 // indirect
131-
github.com/google/gofuzz v1.2.0 // indirect
132131
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
133132
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
134133
github.com/google/uuid v1.6.0 // indirect
135134
github.com/gorilla/mux v1.8.1 // indirect
136-
github.com/gorilla/websocket v1.5.3 // indirect
135+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
137136
github.com/gosuri/uitable v0.0.4 // indirect
138137
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
139138
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
@@ -245,78 +244,74 @@ require (
245244
gopkg.in/inf.v0 v0.9.1 // indirect
246245
gopkg.in/warnings.v0 v0.1.2 // indirect
247246
gopkg.in/yaml.v3 v3.0.1 // indirect
248-
k8s.io/controller-manager v0.32.3 // indirect
249-
k8s.io/kubectl v0.32.3 // indirect
247+
k8s.io/controller-manager v0.33.2 // indirect
248+
k8s.io/kubectl v0.33.2 // indirect
250249
oras.land/oras-go v1.2.5 // indirect
251-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
250+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
252251
sigs.k8s.io/gateway-api v1.1.0 // indirect
253252
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
254-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
255-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
256-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
253+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
254+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
255+
sigs.k8s.io/randfill v1.0.0 // indirect
256+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
257257
)
258258

259-
// cel-go v0.23.0 upgrade causes errors raised from the vendor source which lead to think in
260-
// incompatibilities scenarios. After upgrade to use the latest versions of k8s/api v0.33+
261-
// we should try to see if we could fix this one and remove this replace
262-
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
259+
replace k8s.io/api => k8s.io/api v0.33.2
263260

264-
replace k8s.io/api => k8s.io/api v0.32.3
261+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2
265262

266-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.3
263+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.2
267264

268-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
265+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.2
269266

270-
replace k8s.io/apiserver => k8s.io/apiserver v0.32.3
267+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2
271268

272-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.3
269+
replace k8s.io/client-go => k8s.io/client-go v0.33.2
273270

274-
replace k8s.io/client-go => k8s.io/client-go v0.32.3
271+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2
275272

276-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.3
273+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2
277274

278-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.3
275+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.2
279276

280-
replace k8s.io/code-generator => k8s.io/code-generator v0.32.3
277+
replace k8s.io/component-base => k8s.io/component-base v0.33.2
281278

282-
replace k8s.io/component-base => k8s.io/component-base v0.32.3
279+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.2
283280

284-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.3
281+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.2
285282

286-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.3
283+
replace k8s.io/cri-api => k8s.io/cri-api v0.33.2
287284

288-
replace k8s.io/cri-api => k8s.io/cri-api v0.32.3
285+
replace k8s.io/cri-client => k8s.io/cri-client v0.33.2
289286

290-
replace k8s.io/cri-client => k8s.io/cri-client v0.32.3
287+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2
291288

292-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.3
289+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2
293290

294-
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.3
291+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.2
295292

296-
replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.3
293+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.2
297294

298-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.3
295+
replace k8s.io/kms => k8s.io/kms v0.33.2
299296

300-
replace k8s.io/kms => k8s.io/kms v0.32.3
297+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2
301298

302-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.3
299+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2
303300

304-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.3
301+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2
305302

306-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.3
303+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2
307304

308-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.3
305+
replace k8s.io/kubectl => k8s.io/kubectl v0.33.2
309306

310-
replace k8s.io/kubectl => k8s.io/kubectl v0.32.3
307+
replace k8s.io/kubelet => k8s.io/kubelet v0.33.2
311308

312-
replace k8s.io/kubelet => k8s.io/kubelet v0.32.3
309+
replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.2
313310

314-
replace k8s.io/kubernetes => k8s.io/kubernetes v1.32.3
311+
replace k8s.io/metrics => k8s.io/metrics v0.33.2
315312

316-
replace k8s.io/metrics => k8s.io/metrics v0.32.3
313+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.2
317314

318-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.3
315+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2
319316

320-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.3
321-
322-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.3
317+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2

‎go.sum

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
236236
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
237237
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
238238
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
239-
github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40=
240-
github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
239+
github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY=
240+
github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI=
241241
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
242242
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
243243
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -268,8 +268,8 @@ github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyE
268268
github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
269269
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
270270
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
271-
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
272-
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
271+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
272+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
273273
github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
274274
github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
275275
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -540,12 +540,12 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
540540
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
541541
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
542542
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
543-
go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
544-
go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=
545-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw=
546-
go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w=
547-
go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY=
548-
go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo=
543+
go.etcd.io/etcd/api/v3 v3.5.21 h1:A6O2/JDb3tvHhiIz3xf9nJ7REHvtEFJJ3veW3FbCnS8=
544+
go.etcd.io/etcd/api/v3 v3.5.21/go.mod h1:c3aH5wcvXv/9dqIw2Y810LDXJfhSYdHQ0vxmP3CCHVY=
545+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 h1:lPBu71Y7osQmzlflM9OfeIV2JlmpBjqBNlLtcoBqUTc=
546+
go.etcd.io/etcd/client/pkg/v3 v3.5.21/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs=
547+
go.etcd.io/etcd/client/v3 v3.5.21 h1:T6b1Ow6fNjOLOtM0xSoKNQt1ASPCLWrF9XMHcH9pEyY=
548+
go.etcd.io/etcd/client/v3 v3.5.21/go.mod h1:mFYy67IOqmbRf/kRUvsHixzo3iG+1OF2W2+jVIQRAnU=
549549
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
550550
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
551551
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
@@ -789,53 +789,56 @@ helm.sh/helm/v3 v3.17.3 h1:3n5rW3D0ArjFl0p4/oWO8IbY/HKaNNwJtOQFdH2AZHg=
789789
helm.sh/helm/v3 v3.17.3/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8=
790790
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
791791
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
792-
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
793-
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
794-
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=
795-
k8s.io/apiextensions-apiserver v0.32.3/go.mod h1:8YwcvVRMVzw0r1Stc7XfGAzB/SIVLunqApySV5V7Dss=
796-
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
797-
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
798-
k8s.io/apiserver v0.32.3 h1:kOw2KBuHOA+wetX1MkmrxgBr648ksz653j26ESuWNY8=
799-
k8s.io/apiserver v0.32.3/go.mod h1:q1x9B8E/WzShF49wh3ADOh6muSfpmFL0I2t+TG0Zdgc=
800-
k8s.io/cli-runtime v0.32.3 h1:khLF2ivU2T6Q77H97atx3REY9tXiA3OLOjWJxUrdvss=
801-
k8s.io/cli-runtime v0.32.3/go.mod h1:vZT6dZq7mZAca53rwUfdFSZjdtLyfF61mkf/8q+Xjak=
802-
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
803-
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
804-
k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k=
805-
k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI=
806-
k8s.io/component-helpers v0.32.3 h1:9veHpOGTPLluqU4hAu5IPOwkOIZiGAJUhHndfVc5FT4=
807-
k8s.io/component-helpers v0.32.3/go.mod h1:utTBXk8lhkJewBKNuNf32Xl3KT/0VV19DmiXU/SV4Ao=
808-
k8s.io/controller-manager v0.32.3 h1:jBxZnQ24k6IMeWLyxWZmpa3QVS7ww+osAIzaUY/jqyc=
809-
k8s.io/controller-manager v0.32.3/go.mod h1:out1L3DZjE/p7JG0MoMMIaQGWIkt3c+pKaswqSHgKsI=
792+
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
793+
k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
794+
k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
795+
k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
796+
k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
797+
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
798+
k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
799+
k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
800+
k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
801+
k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
802+
k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
803+
k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
804+
k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
805+
k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
806+
k8s.io/component-helpers v0.33.2 h1:AjCtYzst11NV8ensxV/2LEEXRwctqS7Bs44bje9Qcnw=
807+
k8s.io/component-helpers v0.33.2/go.mod h1:PsPpiCk74n8pGWp1d6kjK/iSKBTyQfIacv02BNkMenU=
808+
k8s.io/controller-manager v0.33.2 h1:HIs8PbdTOaY6wTOvKKLwoAHSO6GeDjmYS0Gjnd6rF+c=
809+
k8s.io/controller-manager v0.33.2/go.mod h1:n8maAdN06E3cD0h5N0wuYBv9Qi9FePl7y6Iz3pfc9PY=
810810
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
811811
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
812-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
813-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
814-
k8s.io/kubectl v0.32.3 h1:VMi584rbboso+yjfv0d8uBHwwxbC438LKq+dXd5tOAI=
815-
k8s.io/kubectl v0.32.3/go.mod h1:6Euv2aso5GKzo/UVMacV6C7miuyevpfI91SvBvV9Zdg=
816-
k8s.io/kubernetes v1.32.3 h1:2A58BlNME8NwsMawmnM6InYo3Jf35Nw5G79q46kXwoA=
817-
k8s.io/kubernetes v1.32.3/go.mod h1:GvhiBeolvSRzBpFlgM0z/Bbu3Oxs9w3P6XfEgYaMi8k=
818-
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
819-
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
812+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
813+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
814+
k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
815+
k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
816+
k8s.io/kubernetes v1.33.2 h1:Vk3hsCaazyMQ6CXhu029AEPlBoYsEnD8oEIC0bP2pWQ=
817+
k8s.io/kubernetes v1.33.2/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00=
818+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
819+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
820820
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
821821
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
822822
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
823823
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
824-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 h1:uOuSLOMBWkJH0TWa9X6l+mj5nZdm6Ay6Bli8HL8rNfk=
825-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
826-
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
827-
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
824+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
825+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
826+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
827+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
828828
sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=
829829
sigs.k8s.io/controller-tools v0.17.3/go.mod h1:1ii+oXcYZkxcBXzwv3YZBlzjt1fvkrCGjVF73blosJI=
830830
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
831831
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
832832
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
833833
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
834-
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=
835-
sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U=
836-
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
837-
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
838-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
839-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
834+
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
835+
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
836+
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
837+
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
838+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
839+
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
840+
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
841+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
842+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
840843
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
841844
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎hack/ci/custom-linters/analyzers/testdata/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module testdata
22

3-
go 1.23.4
3+
go 1.24.3
44

5-
require github.com/go-logr/logr v1.4.2
5+
require github.com/go-logr/logr v1.4.3

‎hack/ci/custom-linters/analyzers/testdata/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
22
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
3+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
4+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

‎internal/operator-controller/contentmanager/source/dynamicsource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (dis *dynamicInformerSource) Start(ctx context.Context, q workqueue.TypedRa
120120
dis.cfg.OnPostSyncError(dis.informerCtx)
121121
}
122122
dis.informerCancel()
123-
cgocache.DefaultWatchErrorHandler(r, err)
123+
cgocache.DefaultWatchErrorHandler(dis.informerCtx, r, err)
124124
})
125125
if err != nil {
126126
return fmt.Errorf("setting WatchErrorHandler: %w", err)

0 commit comments

Comments
 (0)