Skip to content

Commit 437c30d

Browse files
nginx-botdependabot[bot]
nginx-bot
and
dependabot[bot]
authored
[cherry-pick] Bump the go group with 2 updates (#6591)
* Bump the go group with 2 updates (#6589) * Bump the go group with 2 updates Bumps the go group with 2 updates: [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) and [k8s.io/utils](https://github.com/kubernetes/utils). Updates `github.com/cert-manager/cert-manager` from 1.15.3 to 1.16.0 - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md) - [Commits](cert-manager/cert-manager@v1.15.3...v1.16.0) Updates `k8s.io/utils` from 0.0.0-20240711033017-18e509b52bc8 to 0.0.0-20240921022957-49e7df575cb6 - [Commits](https://github.com/kubernetes/utils/commits) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: k8s.io/utils dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <[email protected]> * convert to using TypedRateLimiting interface --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 4dd31b3 commit 437c30d

File tree

4 files changed

+62
-62
lines changed

4 files changed

+62
-62
lines changed

‎go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.2
55
require (
66
github.com/aws/aws-sdk-go-v2/config v1.27.39
77
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.24.3
8-
github.com/cert-manager/cert-manager v1.15.3
8+
github.com/cert-manager/cert-manager v1.16.0
99
github.com/dlclark/regexp2 v1.11.4
1010
github.com/gkampitakis/go-snaps v0.5.7
1111
github.com/go-chi/chi/v5 v5.1.0
@@ -29,7 +29,7 @@ require (
2929
k8s.io/apimachinery v0.31.1
3030
k8s.io/client-go v0.31.1
3131
k8s.io/code-generator v0.31.1
32-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
3333
sigs.k8s.io/controller-tools v0.16.3
3434
)
3535

@@ -55,7 +55,7 @@ require (
5555
github.com/coreos/go-semver v0.3.1 // indirect
5656
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5757
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
58-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
58+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5959
github.com/fatih/color v1.17.0 // indirect
6060
github.com/felixge/httpsnoop v1.0.4 // indirect
6161
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -111,8 +111,8 @@ require (
111111
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
112112
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
113113
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
115+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
116116
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
117117
go.opentelemetry.io/otel/metric v1.30.0 // indirect
118118
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
@@ -123,27 +123,27 @@ require (
123123
golang.org/x/crypto v0.27.0 // indirect
124124
golang.org/x/mod v0.21.0 // indirect
125125
golang.org/x/net v0.29.0 // indirect
126-
golang.org/x/oauth2 v0.22.0 // indirect
126+
golang.org/x/oauth2 v0.23.0 // indirect
127127
golang.org/x/sync v0.8.0 // indirect
128128
golang.org/x/sys v0.25.0 // indirect
129129
golang.org/x/term v0.24.0 // indirect
130130
golang.org/x/text v0.18.0 // indirect
131-
golang.org/x/time v0.5.0 // indirect
131+
golang.org/x/time v0.6.0 // indirect
132132
golang.org/x/tools v0.25.0 // indirect
133133
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
134134
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
135-
google.golang.org/grpc v1.66.1 // indirect
135+
google.golang.org/grpc v1.66.2 // indirect
136136
google.golang.org/protobuf v1.34.2 // indirect
137137
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
138138
gopkg.in/inf.v0 v0.9.1 // indirect
139139
gopkg.in/yaml.v2 v2.4.0 // indirect
140140
gopkg.in/yaml.v3 v3.0.1 // indirect
141-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
142-
k8s.io/apiserver v0.31.0 // indirect
143-
k8s.io/component-base v0.31.0 // indirect
144-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
141+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
142+
k8s.io/apiserver v0.31.1 // indirect
143+
k8s.io/component-base v0.31.1 // indirect
144+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
145145
k8s.io/klog/v2 v2.130.1 // indirect
146-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
146+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
147147
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
148148
sigs.k8s.io/gateway-api v1.1.0 // indirect
149149
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎go.sum‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
3838
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
3939
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
4040
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
41-
github.com/cert-manager/cert-manager v1.15.3 h1:/u9T0griwd5MegPfWbB7v0KcVcT9OJrEvPNhc9tl7xQ=
42-
github.com/cert-manager/cert-manager v1.15.3/go.mod h1:stBge/DTvrhfQMB/93+Y62s+gQgZBsfL1o0C/4AL/mI=
41+
github.com/cert-manager/cert-manager v1.16.0 h1:Gz20ezVUW1hveItLurl4OuFmSwwo0d7vr5gULjyeGlc=
42+
github.com/cert-manager/cert-manager v1.16.0/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
4343
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
4444
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
4545
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -56,8 +56,8 @@ github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yA
5656
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
5757
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
5858
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
59-
github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
60-
github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
59+
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
60+
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
6161
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
6262
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
6363
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -283,10 +283,10 @@ go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA=
283283
go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw=
284284
go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok=
285285
go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ=
286-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g=
287-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74=
288-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
289-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
286+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=
287+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=
288+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
289+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
290290
go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts=
291291
go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc=
292292
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4=
@@ -338,8 +338,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
338338
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
339339
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
340340
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
341-
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
342-
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
341+
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
342+
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
343343
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
344344
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
345345
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -378,8 +378,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
378378
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
379379
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
380380
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
381-
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
382-
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
381+
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
382+
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
383383
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
384384
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
385385
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -392,14 +392,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
392392
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
393393
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
394394
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
395-
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda h1:wu/KJm9KJwpfHWhkkZGohVC6KRrc1oJNr4jwtQMOQXw=
396-
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda/go.mod h1:g2LLCvCeCSir/JJSWosk19BR4NVxGqHUC6rxIRsd7Aw=
395+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY=
396+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
397397
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc=
398398
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
399399
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
400400
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
401-
google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM=
402-
google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
401+
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
402+
google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
403403
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
404404
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
405405
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -422,26 +422,26 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
422422
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
423423
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
424424
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
425-
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
426-
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
425+
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
426+
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
427427
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
428428
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
429-
k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY=
430-
k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk=
429+
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
430+
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
431431
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
432432
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
433433
k8s.io/code-generator v0.31.1 h1:GvkRZEP2g2UnB2QKT2Dgc/kYxIkDxCHENv2Q1itioVs=
434434
k8s.io/code-generator v0.31.1/go.mod h1:oL2ky46L48osNqqZAeOcWWy0S5BXj50vVdwOtTefqIs=
435-
k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
436-
k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
437-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
438-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
435+
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
436+
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
437+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 h1:cErOOTkQ3JW19o4lo91fFurouhP8NcoBvb7CkvhZZpk=
438+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
439439
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
440440
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
441-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM=
442-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro=
443-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
444-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
441+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo=
442+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA=
443+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
444+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
445445
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
446446
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
447447
sigs.k8s.io/controller-tools v0.16.3 h1:z48C5/d4jCVQQvtiSBL5MYyZ3EO2eFIOXrIKMgHVhFY=

‎internal/certmanager/cm_controller.go‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ import (
2828
controllerpkg "github.com/cert-manager/cert-manager/pkg/controller"
2929
"github.com/golang/glog"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
31+
"k8s.io/apimachinery/pkg/types"
3132
"k8s.io/apimachinery/pkg/util/runtime"
33+
3234
kubeinformers "k8s.io/client-go/informers"
3335
"k8s.io/client-go/kubernetes"
3436
"k8s.io/client-go/rest"
@@ -60,7 +62,7 @@ const (
6062
type CmController struct {
6163
sync SyncFn
6264
ctx context.Context
63-
queue workqueue.RateLimitingInterface
65+
queue workqueue.TypedRateLimitingInterface[types.NamespacedName]
6466
informerGroup map[string]*namespacedInformer
6567
recorder record.EventRecorder
6668
cmClient *cm_clientset.Clientset
@@ -90,7 +92,7 @@ type namespacedInformer struct {
9092
lock sync.RWMutex
9193
}
9294

93-
func (c *CmController) register() workqueue.RateLimitingInterface {
95+
func (c *CmController) register() workqueue.TypedRateLimitingInterface[types.NamespacedName] {
9496
c.sync = SyncFnFor(c.recorder, c.cmClient, c.informerGroup)
9597
return c.queue
9698
}
@@ -135,17 +137,15 @@ func (c *CmController) addHandlers(nsi *namespacedInformer) {
135137
nsi.mustSync = append(nsi.mustSync, nsi.cmSharedInformerFactory.Certmanager().V1().Certificates().Informer().HasSynced)
136138
}
137139

138-
func (c *CmController) processItem(ctx context.Context, key string) error {
139-
glog.V(3).Infof("processing virtual server resource ")
140-
namespace, name, err := cache.SplitMetaNamespaceKey(key)
141-
if err != nil {
142-
runtime.HandleError(fmt.Errorf("invalid resource key: %s", key))
143-
return err
144-
}
140+
func (c *CmController) processItem(ctx context.Context, key types.NamespacedName) error {
141+
glog.V(3).Infof("processing virtual server resource")
142+
namespace := key.Namespace
143+
name := key.Name
144+
145145
nsi := getNamespacedInformer(namespace, c.informerGroup)
146146

147147
var vs *conf_v1.VirtualServer
148-
vs, err = nsi.vsLister.VirtualServers(namespace).Get(name)
148+
vs, err := nsi.vsLister.VirtualServers(namespace).Get(name)
149149

150150
// VS has been deleted
151151
if apierrors.IsNotFound(err) {
@@ -173,7 +173,7 @@ func (c *CmController) processItem(ctx context.Context, key string) error {
173173
// name: vs-1
174174
// blockOwnerDeletion: true
175175
// uid: 7d3897c2-ce27-4144-883a-e1b5f89bd65a
176-
func certificateHandler(queue workqueue.RateLimitingInterface) func(obj interface{}) {
176+
func certificateHandler(queue workqueue.TypedRateLimitingInterface[types.NamespacedName]) func(obj interface{}) {
177177
return func(obj interface{}) {
178178
crt, ok := obj.(*cmapi.Certificate)
179179
if !ok {
@@ -195,7 +195,10 @@ func certificateHandler(queue workqueue.RateLimitingInterface) func(obj interfac
195195
return
196196
}
197197

198-
queue.Add(crt.Namespace + "/" + ref.Name)
198+
queue.Add(types.NamespacedName{
199+
Namespace: crt.Namespace,
200+
Name: ref.Name,
201+
})
199202
}
200203
}
201204

@@ -208,7 +211,7 @@ func NewCmController(opts *CmOpts) *CmController {
208211

209212
cm := &CmController{
210213
ctx: opts.context,
211-
queue: workqueue.NewNamedRateLimitingQueue(controllerpkg.DefaultItemBasedRateLimiter(), ControllerName),
214+
queue: workqueue.NewTypedRateLimitingQueueWithConfig(controllerpkg.DefaultItemBasedRateLimiter(), workqueue.TypedRateLimitingQueueConfig[types.NamespacedName]{Name: ControllerName}),
212215
informerGroup: ig,
213216
recorder: opts.eventRecorder,
214217
cmClient: intcl,
@@ -283,16 +286,11 @@ func (c *CmController) runWorker(ctx context.Context) {
283286
break
284287
}
285288

286-
var key string
287289
// use an inlined function so we can use defer
288290
func() {
289291
defer c.queue.Done(obj)
290-
var ok bool
291-
if key, ok = obj.(string); !ok {
292-
return
293-
}
294292

295-
err := c.processItem(ctx, key)
293+
err := c.processItem(ctx, obj)
296294
if err != nil {
297295
glog.V(3).Infof("Re-queuing item due to error processing: %v", err)
298296
c.queue.AddRateLimited(obj)

‎internal/certmanager/cm_controller_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package certmanager
1818

1919
import (
2020
"context"
21+
"fmt"
2122
"testing"
2223
"time"
2324

@@ -29,6 +30,7 @@ import (
2930
"github.com/stretchr/testify/require"
3031
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3132
"k8s.io/apimachinery/pkg/runtime"
33+
"k8s.io/apimachinery/pkg/types"
3234
"k8s.io/client-go/util/workqueue"
3335

3436
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
@@ -147,7 +149,7 @@ func Test_controller_Register(t *testing.T) {
147149

148150
cm := &CmController{
149151
ctx: b.RootContext,
150-
queue: workqueue.NewNamedRateLimitingQueue(controllerpkg.DefaultItemBasedRateLimiter(), ControllerName),
152+
queue: workqueue.NewTypedRateLimitingQueueWithConfig(controllerpkg.DefaultItemBasedRateLimiter(), workqueue.TypedRateLimitingQueueConfig[types.NamespacedName]{Name: ControllerName}),
151153
informerGroup: ig,
152154
recorder: b.Recorder,
153155
kubeClient: b.Client,
@@ -178,7 +180,7 @@ func Test_controller_Register(t *testing.T) {
178180
if done {
179181
break
180182
}
181-
gotKeys = append(gotKeys, gotKey.(string))
183+
gotKeys = append(gotKeys, fmt.Sprintf("%s/%s", gotKey.Namespace, gotKey.Name))
182184
}
183185
assert.Equal(t, 0, queue.Len(), "queue should be empty")
184186

0 commit comments

Comments
 (0)