Skip to content

Commit 2639954

Browse files
MiciahMiciah
committed
Bump controller-runtime to v0.18.4
Bump the vendored sigs.k8s.io/controller-runtime package to v0.18.4, the latest release, which uses the k8s.io/* v0.30.1 packages. Bump the vendored k8s.io/client-go package to v0.30.2. A previous commit bumped the other k8s.io/* packages to v0.30.2 but left k8s.io/client-go at v0.29.0. However, controller-runtime v0.18.4 requires k8s.io/client-go v0.30.0 or newer because of a breaking change in the client-go leaderelection package. go get sigs.k8s.io/[email protected] go mod edit -replace=k8s.io/client-go=k8s.io/[email protected] go mod tidy go mod vendor Update calls to controller.Watch to adapt to breaking changes in controller-runtime. Namely, the handler and predicate arguments have been removed from Watch and are now specified as options on the source. Additionally, the source.Kind type now has a type parameter, so it is necessary to specify a client.Object type argument. Follow-up to commit fdb6215, which bumped the other k8s.io/* packages to v0.30.2. This commit fixes OCPBUGS-38079. https://issues.redhat.com/browse/OCPBUGS-38079 * go.mod: Bump. * go.sum: Regenerate. * pkg/operator/controller/canary/controller.go (New): * pkg/operator/controller/certificate-publisher/controller.go (New): * pkg/operator/controller/certificate/controller.go (New): * pkg/operator/controller/clientca-configmap/controller.go (New): * pkg/operator/controller/configurable-route/controller.go (New): * pkg/operator/controller/crl/controller.go (New): * pkg/operator/controller/dns/controller.go (New): * pkg/operator/controller/gateway-service-dns/controller.go (NewUnmanaged): * pkg/operator/controller/gatewayapi/controller.go (New): * pkg/operator/controller/gatewayapi/controller_test.go ((fakeController).Watch): * pkg/operator/controller/gatewayclass/controller.go (NewUnmanaged): * pkg/operator/controller/ingress/controller.go (New): * pkg/operator/controller/ingressclass/controller.go (New): * pkg/operator/controller/monitoring-dashboard/controller.go (New): * pkg/operator/controller/route-metrics/controller.go (New): * pkg/operator/controller/status/controller.go (New): * pkg/operator/controller/sync-http-error-code-configmap/controller.go (New): Update for the new controller.Watch and source.Kind type signatures. * vendor/*: Regenerate.
1 parent 3384355 commit 2639954

File tree

215 files changed

+15832
-1990
lines changed

Some content is hidden

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

215 files changed

+15832
-1990
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
k8s.io/apiserver v0.30.2
4747
k8s.io/client-go v12.0.0+incompatible
4848
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
49-
sigs.k8s.io/controller-runtime v0.17.3
49+
sigs.k8s.io/controller-runtime v0.18.4
5050
sigs.k8s.io/gateway-api v0.5.1-0.20220921185115-ee7a83814203
5151
)
5252

@@ -69,7 +69,7 @@ require (
6969
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
7070
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
7171
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
72-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
72+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7373
github.com/fatih/color v1.12.0 // indirect
7474
github.com/fsnotify/fsnotify v1.7.0 // indirect
7575
github.com/go-openapi/errors v0.19.8 // indirect
@@ -158,5 +158,5 @@ require (
158158
replace (
159159
bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
160160
github.com/openshift/api => github.com/openshift/api v0.0.0-20240806152114-6b4a57ec20b0
161-
k8s.io/client-go => k8s.io/client-go v0.29.0
161+
k8s.io/client-go => k8s.io/client-go v0.30.2
162162
)

‎go.sum‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
934934
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
935935
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
936936
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
937-
github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro=
938-
github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
937+
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
938+
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
939939
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
940940
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc=
941941
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
@@ -1617,8 +1617,9 @@ github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+
16171617
github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
16181618
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
16191619
github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
1620-
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
16211620
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
1621+
github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
1622+
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
16221623
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
16231624
github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
16241625
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1646,8 +1647,9 @@ github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJK
16461647
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
16471648
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
16481649
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
1649-
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
16501650
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
1651+
github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
1652+
github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
16511653
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
16521654
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
16531655
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -2503,7 +2505,6 @@ golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjs
25032505
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
25042506
golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
25052507
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
2506-
golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
25072508
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
25082509
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
25092510
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -2947,7 +2948,6 @@ k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
29472948
k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA=
29482949
k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
29492950
k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs=
2950-
k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
29512951
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
29522952
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
29532953
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
@@ -2972,7 +2972,6 @@ k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftc
29722972
k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
29732973
k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
29742974
k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
2975-
k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
29762975
k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
29772976
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
29782977
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
@@ -2989,8 +2988,8 @@ k8s.io/autoscaler v0.0.0-20190607113959-1b4f1855cb8e/go.mod h1:QEXezc9uKPT91dwqh
29892988
k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ=
29902989
k8s.io/cli-runtime v0.18.2/go.mod h1:yfFR2sQQzDsV0VEKGZtrJwEy4hLZ2oj4ZIfodgxAHWQ=
29912990
k8s.io/cli-runtime v0.18.3/go.mod h1:pqbbi4nqRIQhUWAVzen8uE8DD/zcZLwf+8sQYO4lwLk=
2992-
k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
2993-
k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
2991+
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
2992+
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
29942993
k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=
29952994
k8s.io/code-generator v0.16.7/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=
29962995
k8s.io/code-generator v0.17.1/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s=
@@ -3014,7 +3013,6 @@ k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
30143013
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
30153014
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
30163015
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
3017-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
30183016
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
30193017
k8s.io/helm v2.16.7+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
30203018
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@@ -3026,7 +3024,6 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
30263024
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
30273025
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
30283026
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
3029-
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
30303027
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
30313028
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
30323029
k8s.io/kube-aggregator v0.17.1/go.mod h1:H5LcB3fx+P1gpowuZpzDu5B1XfABdO7JBKyB9J9bt34=
@@ -3040,7 +3037,6 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKf
30403037
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
30413038
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
30423039
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
3043-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
30443040
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
30453041
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
30463042
k8s.io/kube-state-metrics v1.7.2/go.mod h1:U2Y6DRi07sS85rmVPmBFlmv+2peBcL8IWGjM+IjYA/E=
@@ -3057,7 +3053,6 @@ k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl
30573053
k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
30583054
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
30593055
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
3060-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
30613056
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
30623057
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
30633058
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
@@ -3108,8 +3103,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
31083103
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
31093104
sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo=
31103105
sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
3111-
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
3112-
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
3106+
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
3107+
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
31133108
sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA=
31143109
sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
31153110
sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=

‎pkg/operator/controller/canary/controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func New(mgr manager.Manager, config Config) (controller.Controller, error) {
9292
return o.GetName() == manifests.DefaultIngressControllerName
9393
})
9494

95-
if err := c.Watch(source.Kind(operatorCache, &operatorv1.IngressController{}), &handler.EnqueueRequestForObject{}, defaultIcPredicate); err != nil {
95+
if err := c.Watch(source.Kind[client.Object](operatorCache, &operatorv1.IngressController{}, &handler.EnqueueRequestForObject{}, defaultIcPredicate)); err != nil {
9696
return nil, err
9797
}
9898

@@ -143,21 +143,21 @@ func New(mgr manager.Manager, config Config) (controller.Controller, error) {
143143
},
144144
}
145145

146-
if err := c.Watch(source.Kind(operatorCache, &routev1.Route{}), enqueueRequestForDefaultIngressController(config.Namespace), canaryRoutePredicate, updateFilter); err != nil {
146+
if err := c.Watch(source.Kind[client.Object](operatorCache, &routev1.Route{}, enqueueRequestForDefaultIngressController(config.Namespace), canaryRoutePredicate, updateFilter)); err != nil {
147147
return nil, err
148148
}
149149
canaryDaemonSetPredicate := predicate.NewPredicateFuncs(func(o client.Object) bool {
150150
canaryDaemonSet := operatorcontroller.CanaryDaemonSetName()
151151
return o.GetNamespace() == canaryDaemonSet.Namespace && o.GetName() == canaryDaemonSet.Name
152152
})
153-
if err := c.Watch(source.Kind(operatorCache, &appsv1.DaemonSet{}), enqueueRequestForDefaultIngressController(config.Namespace), canaryDaemonSetPredicate); err != nil {
153+
if err := c.Watch(source.Kind[client.Object](operatorCache, &appsv1.DaemonSet{}, enqueueRequestForDefaultIngressController(config.Namespace), canaryDaemonSetPredicate)); err != nil {
154154
return nil, err
155155
}
156156
canaryServicePredicate := predicate.NewPredicateFuncs(func(o client.Object) bool {
157157
canaryService := operatorcontroller.CanaryServiceName()
158158
return o.GetNamespace() == canaryService.Namespace && o.GetName() == canaryService.Name
159159
})
160-
if err := c.Watch(source.Kind(operatorCache, &corev1.Service{}), enqueueRequestForDefaultIngressController(config.Namespace), canaryServicePredicate); err != nil {
160+
if err := c.Watch(source.Kind[client.Object](operatorCache, &corev1.Service{}, enqueueRequestForDefaultIngressController(config.Namespace), canaryServicePredicate)); err != nil {
161161
return nil, err
162162
}
163163

‎pkg/operator/controller/certificate-publisher/controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ func New(mgr manager.Manager, operatorNamespace, operandNamespace string) (runti
8585
if err != nil {
8686
return nil, fmt.Errorf("failed to create informer for secrets: %v", err)
8787
}
88-
if err := c.Watch(&source.Informer{Informer: secretsInformer}, handler.EnqueueRequestsFromMapFunc(reconciler.secretToIngressController)); err != nil {
88+
if err := c.Watch(&source.Informer{Informer: secretsInformer, Handler: handler.EnqueueRequestsFromMapFunc(reconciler.secretToIngressController)}); err != nil {
8989
return nil, err
9090
}
9191

92-
if err := c.Watch(source.Kind(operatorCache, &operatorv1.IngressController{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{
92+
if err := c.Watch(source.Kind[client.Object](operatorCache, &operatorv1.IngressController{}, &handler.EnqueueRequestForObject{}, predicate.Funcs{
9393
CreateFunc: func(e event.CreateEvent) bool { return reconciler.hasSecret(e.Object, e.Object) },
9494
DeleteFunc: func(e event.DeleteEvent) bool { return reconciler.hasSecret(e.Object, e.Object) },
9595
UpdateFunc: func(e event.UpdateEvent) bool { return reconciler.secretChanged(e.ObjectOld, e.ObjectNew) },
9696
GenericFunc: func(e event.GenericEvent) bool { return reconciler.hasSecret(e.Object, e.Object) },
9797
}, predicate.NewPredicateFuncs(func(o client.Object) bool {
9898
return reconciler.hasClusterIngressDomain(o) || isDefaultIngressController(o)
99-
})); err != nil {
99+
}))); err != nil {
100100
return nil, err
101101
}
102102

‎pkg/operator/controller/certificate/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func New(mgr manager.Manager, operatorNamespace string) (runtimecontroller.Contr
4848
if err != nil {
4949
return nil, err
5050
}
51-
if err := c.Watch(source.Kind(operatorCache, &operatorv1.IngressController{}), &handler.EnqueueRequestForObject{}); err != nil {
51+
if err := c.Watch(source.Kind[client.Object](operatorCache, &operatorv1.IngressController{}, &handler.EnqueueRequestForObject{})); err != nil {
5252
return nil, err
5353
}
5454
return c, nil

‎pkg/operator/controller/clientca-configmap/controller.go‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,25 @@ func New(mgr manager.Manager, config Config) (controller.Controller, error) {
5555

5656
// If the ingresscontroller's configmap reference changes, reconcile the
5757
// ingresscontroller.
58-
if err := c.Watch(
59-
source.Kind(operatorCache, &operatorv1.IngressController{}),
60-
&handler.EnqueueRequestForObject{},
61-
predicate.Funcs{
62-
CreateFunc: func(e event.CreateEvent) bool {
63-
return hasConfigMap(e.Object)
64-
},
65-
DeleteFunc: func(e event.DeleteEvent) bool {
66-
return hasConfigMap(e.Object)
67-
},
68-
UpdateFunc: func(e event.UpdateEvent) bool {
69-
oldIC := e.ObjectOld.(*operatorv1.IngressController)
70-
newIC := e.ObjectNew.(*operatorv1.IngressController)
71-
oldName := oldIC.Spec.ClientTLS.ClientCA.Name
72-
newName := newIC.Spec.ClientTLS.ClientCA.Name
73-
return oldName != newName ||
74-
oldIC.DeletionTimestamp != newIC.DeletionTimestamp
75-
},
76-
GenericFunc: func(e event.GenericEvent) bool {
77-
return hasConfigMap(e.Object)
78-
},
58+
if err := c.Watch(source.Kind[client.Object](operatorCache, &operatorv1.IngressController{}, &handler.EnqueueRequestForObject{}, predicate.Funcs{
59+
CreateFunc: func(e event.CreateEvent) bool {
60+
return hasConfigMap(e.Object)
7961
},
80-
); err != nil {
62+
DeleteFunc: func(e event.DeleteEvent) bool {
63+
return hasConfigMap(e.Object)
64+
},
65+
UpdateFunc: func(e event.UpdateEvent) bool {
66+
oldIC := e.ObjectOld.(*operatorv1.IngressController)
67+
newIC := e.ObjectNew.(*operatorv1.IngressController)
68+
oldName := oldIC.Spec.ClientTLS.ClientCA.Name
69+
newName := newIC.Spec.ClientTLS.ClientCA.Name
70+
return oldName != newName ||
71+
oldIC.DeletionTimestamp != newIC.DeletionTimestamp
72+
},
73+
GenericFunc: func(e event.GenericEvent) bool {
74+
return hasConfigMap(e.Object)
75+
},
76+
})); err != nil {
8177
return nil, err
8278
}
8379

@@ -145,20 +141,12 @@ func New(mgr manager.Manager, config Config) (controller.Controller, error) {
145141
}
146142

147143
userCMToIC := makeMapFunc(clientCAUserConfigmapIndexFieldName)
148-
if err := c.Watch(
149-
source.Kind(operatorCache, &corev1.ConfigMap{}),
150-
handler.EnqueueRequestsFromMapFunc(userCMToIC),
151-
predicate.NewPredicateFuncs(isInNS(config.SourceNamespace)),
152-
); err != nil {
144+
if err := c.Watch(source.Kind[client.Object](operatorCache, &corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(userCMToIC), predicate.NewPredicateFuncs(isInNS(config.SourceNamespace)))); err != nil {
153145
return nil, err
154146
}
155147

156148
operatorCMToIC := makeMapFunc(clientCAOperatorConfigmapIndexFieldName)
157-
if err := c.Watch(
158-
source.Kind(operatorCache, &corev1.ConfigMap{}),
159-
handler.EnqueueRequestsFromMapFunc(operatorCMToIC),
160-
predicate.NewPredicateFuncs(isInNS(config.TargetNamespace)),
161-
); err != nil {
149+
if err := c.Watch(source.Kind[client.Object](operatorCache, &corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(operatorCMToIC), predicate.NewPredicateFuncs(isInNS(config.TargetNamespace)))); err != nil {
162150
return nil, err
163151
}
164152

‎pkg/operator/controller/configurable-route/controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func New(mgr manager.Manager, config Config, eventRecorder events.Recorder) (con
7676
return o.GetName() == clusterIngressResource.Name && o.GetNamespace() == clusterIngressResource.Namespace
7777
})
7878

79-
if err := c.Watch(source.Kind(operatorCache, &configv1.Ingress{}), &handler.EnqueueRequestForObject{}, clusterNamePredicate); err != nil {
79+
if err := c.Watch(source.Kind[client.Object](operatorCache, &configv1.Ingress{}, &handler.EnqueueRequestForObject{}, clusterNamePredicate)); err != nil {
8080
return nil, err
8181
}
8282

@@ -87,11 +87,11 @@ func New(mgr manager.Manager, config Config, eventRecorder events.Recorder) (con
8787
return ok
8888
})
8989

90-
if err := c.Watch(source.Kind(operatorCache, &rbacv1.Role{}), handler.EnqueueRequestsFromMapFunc(reconciler.resourceToClusterIngressConfig), defaultPredicate); err != nil {
90+
if err := c.Watch(source.Kind[client.Object](operatorCache, &rbacv1.Role{}, handler.EnqueueRequestsFromMapFunc(reconciler.resourceToClusterIngressConfig), defaultPredicate)); err != nil {
9191
return nil, err
9292
}
9393

94-
if err := c.Watch(source.Kind(operatorCache, &rbacv1.RoleBinding{}), handler.EnqueueRequestsFromMapFunc(reconciler.resourceToClusterIngressConfig), defaultPredicate); err != nil {
94+
if err := c.Watch(source.Kind[client.Object](operatorCache, &rbacv1.RoleBinding{}, handler.EnqueueRequestsFromMapFunc(reconciler.resourceToClusterIngressConfig), defaultPredicate)); err != nil {
9595
return nil, err
9696
}
9797

0 commit comments

Comments
 (0)