Skip to content

Commit a34f6c2

Browse files
dependabot[bot]lucacomesjberman
authored
Bump sigs.k8s.io/controller-runtime from 0.18.5 to 0.19.0 (#2405)
* Bump sigs.k8s.io/controller-runtime from 0.18.5 to 0.19.0 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.5 to 0.19.0. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.18.5...v0.19.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update tests deps * Use unique controller name --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini <luca.com@gmail.com> Co-authored-by: Saylor Berman <s.berman@f5.com>
1 parent 074f96e commit a34f6c2

File tree

8 files changed

+92
-62
lines changed

8 files changed

+92
-62
lines changed

‎go.mod

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ require (
2020
go.opentelemetry.io/otel v1.28.0
2121
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
2222
go.uber.org/zap v1.27.0
23-
k8s.io/api v0.30.3
24-
k8s.io/apiextensions-apiserver v0.30.3
25-
k8s.io/apimachinery v0.30.3
26-
k8s.io/client-go v0.30.3
27-
sigs.k8s.io/controller-runtime v0.18.5
23+
k8s.io/api v0.31.0
24+
k8s.io/apiextensions-apiserver v0.31.0
25+
k8s.io/apimachinery v0.31.0
26+
k8s.io/client-go v0.31.0
27+
sigs.k8s.io/controller-runtime v0.19.0
2828
sigs.k8s.io/controller-tools v0.15.0
2929
sigs.k8s.io/gateway-api v1.1.0
3030
)
@@ -33,12 +33,12 @@ require (
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3535
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36-
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
38-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3938
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4039
github.com/fatih/color v1.16.0 // indirect
4140
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4242
github.com/go-logfmt/logfmt v0.5.1 // indirect
4343
github.com/go-logr/stdr v1.2.2 // indirect
4444
github.com/go-logr/zapr v1.3.0 // indirect
@@ -70,6 +70,7 @@ require (
7070
github.com/prometheus/client_model v0.6.1 // indirect
7171
github.com/prometheus/procfs v0.15.1 // indirect
7272
github.com/russross/blackfriday/v2 v2.1.0 // indirect
73+
github.com/x448/float16 v0.8.4 // indirect
7374
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
7475
go.opentelemetry.io/otel/metric v1.28.0 // indirect
7576
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
@@ -89,16 +90,17 @@ require (
8990
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9091
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
9192
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
92-
google.golang.org/grpc v1.64.1 // indirect
93+
google.golang.org/grpc v1.65.0 // indirect
9394
google.golang.org/protobuf v1.34.2 // indirect
95+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9496
gopkg.in/inf.v0 v0.9.1 // indirect
9597
gopkg.in/yaml.v2 v2.4.0 // indirect
9698
gopkg.in/yaml.v3 v3.0.1 // indirect
9799
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
98100
k8s.io/klog v0.2.0 // indirect
99-
k8s.io/klog/v2 v2.120.1 // indirect
101+
k8s.io/klog/v2 v2.130.1 // indirect
100102
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
101-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
103+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
102104
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103105
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104106
sigs.k8s.io/yaml v1.4.0 // indirect

‎go.sum

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
88
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
99
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
1010
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
11-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1211
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
12+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
13+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1314
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
1415
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1516
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
@@ -20,6 +21,8 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
2021
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
2122
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
2223
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
24+
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
25+
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
2326
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
2427
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
2528
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
@@ -118,8 +121,9 @@ github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeD
118121
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
119122
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
120123
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
121-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
122124
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
125+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
126+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
123127
github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
124128
github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
125129
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
@@ -149,6 +153,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
149153
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
150154
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
151155
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
156+
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
157+
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
152158
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
153159
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
154160
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
@@ -225,14 +231,16 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:
225231
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw=
226232
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
227233
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
228-
google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
229-
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
234+
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
235+
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
230236
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
231237
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
232238
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
233239
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
234240
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
235241
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
242+
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
243+
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
236244
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
237245
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
238246
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
@@ -243,28 +251,28 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
243251
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
244252
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
245253
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
246-
k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ=
247-
k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04=
248-
k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U=
249-
k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4=
250-
k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
251-
k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
252-
k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
253-
k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
254+
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
255+
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
256+
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
257+
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
258+
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
259+
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
260+
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
261+
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
254262
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
255263
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=
256264
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
257265
k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
258266
k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
259267
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
260-
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
261-
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
268+
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
269+
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
262270
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 h1:Q8Z7VlGhcJgBHJHYugJ/K/7iB8a2eSxCyxdVjJp+lLY=
263271
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
264-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBGe9UyDahzs9zQzQ=
265-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
266-
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
267-
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
272+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
273+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
274+
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
275+
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
268276
sigs.k8s.io/controller-tools v0.15.0 h1:4dxdABXGDhIa68Fiwaif0vcu32xfwmgQ+w8p+5CxoAI=
269277
sigs.k8s.io/controller-tools v0.15.0/go.mod h1:8zUSS2T8Hx0APCNRhJWbS3CAQEbIxLa07khzh7pZmXM=
270278
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=

‎internal/framework/controller/register.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ func defaultConfig() config {
8484
func Register(
8585
ctx context.Context,
8686
objectType ngftypes.ObjectType,
87+
name string,
8788
mgr manager.Manager,
8889
eventCh chan<- interface{},
8990
options ...Option,
@@ -114,7 +115,7 @@ func Register(
114115
forOpts = append(forOpts, ctlrBuilder.OnlyMetadata)
115116
}
116117

117-
builder := ctlr.NewControllerManagedBy(mgr).For(objectType, forOpts...)
118+
builder := ctlr.NewControllerManagedBy(mgr).Named(name).For(objectType, forOpts...)
118119

119120
if cfg.k8sPredicate != nil {
120121
builder = builder.WithEventFilter(cfg.k8sPredicate)

‎internal/framework/controller/register_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ func TestRegister(t *testing.T) {
139139
return controller.Register(
140140
context.Background(),
141141
test.objectType,
142+
test.msg, // unique controller name for each loop iteration
142143
test.fakes.mgr,
143144
eventCh,
144145
controller.WithNamespacedNameFilter(nsNameFilter),

‎internal/mode/provisioner/manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ func StartManager(cfg Config) error {
9494
if err := controller.Register(
9595
ctx,
9696
regCfg.objectType,
97+
regCfg.objectType.GetObjectKind().GroupVersionKind().Kind,
9798
mgr,
9899
eventCh,
99100
regCfg.options...,

‎internal/mode/static/manager.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ func registerControllers(
356356
controlConfigNSName types.NamespacedName,
357357
) error {
358358
type ctlrCfg struct {
359+
name string
359360
objectType ngftypes.ObjectType
360361
options []controller.Option
361362
}
@@ -402,12 +403,14 @@ func registerControllers(
402403
},
403404
{
404405
objectType: &apiv1.Service{},
406+
name: "user-service", // unique controller names are needed and we have multiple Service ctlrs
405407
options: []controller.Option{
406408
controller.WithK8sPredicate(predicate.ServicePortsChangedPredicate{}),
407409
},
408410
},
409411
{
410412
objectType: &apiv1.Service{},
413+
name: "ngf-service", // unique controller names are needed and we have multiple Service ctlrs
411414
options: func() []controller.Option {
412415
svcNSName := types.NamespacedName{
413416
Namespace: cfg.GatewayPodConfig.Namespace,
@@ -521,9 +524,15 @@ func registerControllers(
521524
}
522525

523526
for _, regCfg := range controllerRegCfgs {
527+
name := regCfg.objectType.GetObjectKind().GroupVersionKind().Kind
528+
if regCfg.name != "" {
529+
name = regCfg.name
530+
}
531+
524532
if err := controller.Register(
525533
ctx,
526534
regCfg.objectType,
535+
name,
527536
mgr,
528537
eventCh,
529538
regCfg.options...,

‎tests/go.mod

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@ require (
99
github.com/prometheus/client_golang v1.20.0
1010
github.com/prometheus/common v0.55.0
1111
github.com/tsenart/vegeta/v12 v12.12.0
12-
k8s.io/api v0.30.3
13-
k8s.io/apiextensions-apiserver v0.30.3
14-
k8s.io/apimachinery v0.30.3
15-
k8s.io/client-go v0.30.3
16-
sigs.k8s.io/controller-runtime v0.18.5
12+
k8s.io/api v0.31.0
13+
k8s.io/apiextensions-apiserver v0.31.0
14+
k8s.io/apimachinery v0.31.0
15+
k8s.io/client-go v0.31.0
16+
sigs.k8s.io/controller-runtime v0.19.0
1717
sigs.k8s.io/gateway-api v1.1.0
1818
sigs.k8s.io/yaml v1.4.0
1919
)
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24-
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2626
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2727
github.com/fsnotify/fsnotify v1.7.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2829
github.com/go-logr/logr v1.4.2 // indirect
2930
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3031
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -46,19 +47,19 @@ require (
4647
github.com/klauspost/compress v1.17.9 // indirect
4748
github.com/mailru/easyjson v0.7.7 // indirect
4849
github.com/miekg/dns v1.1.61 // indirect
49-
github.com/moby/spdystream v0.2.0 // indirect
50+
github.com/moby/spdystream v0.4.0 // indirect
5051
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5152
github.com/modern-go/reflect2 v1.0.2 // indirect
5253
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5354
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5455
github.com/pkg/errors v0.9.1 // indirect
55-
github.com/pmezard/go-difflib v1.0.0 // indirect
56+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5657
github.com/prometheus/client_model v0.6.1 // indirect
5758
github.com/prometheus/procfs v0.15.1 // indirect
58-
github.com/rogpeppe/go-internal v1.12.0 // indirect
5959
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
6060
github.com/spf13/pflag v1.0.5 // indirect
6161
github.com/stretchr/testify v1.9.0 // indirect
62+
github.com/x448/float16 v0.8.4 // indirect
6263
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
6364
golang.org/x/mod v0.20.0 // indirect
6465
golang.org/x/net v0.28.0 // indirect
@@ -71,14 +72,14 @@ require (
7172
golang.org/x/tools v0.24.0 // indirect
7273
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7374
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
74-
google.golang.org/grpc v1.64.1 // indirect
75+
google.golang.org/grpc v1.65.0 // indirect
7576
google.golang.org/protobuf v1.34.2 // indirect
7677
gopkg.in/inf.v0 v0.9.1 // indirect
7778
gopkg.in/yaml.v2 v2.4.0 // indirect
7879
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
k8s.io/klog/v2 v2.120.1 // indirect
80+
k8s.io/klog/v2 v2.130.1 // indirect
8081
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
81-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
82+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
8283
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8384
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8485
)

0 commit comments

Comments
 (0)