Skip to content

Commit 76c3f94

Browse files
stefanprodanstefanprodan
committed
Use lazy restmapper vendored from controller-runtime v0.19
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 0837a42 commit 76c3f94

File tree

4 files changed

+60
-63
lines changed

4 files changed

+60
-63
lines changed

‎go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/fluxcd/pkg/apis/meta v1.10.0
2525
github.com/fluxcd/pkg/http/fetch v0.15.0
2626
github.com/fluxcd/pkg/kustomize v1.16.0
27-
github.com/fluxcd/pkg/runtime v0.53.1
27+
github.com/fluxcd/pkg/runtime v0.53.2-0.20250224201542-60bfc04a1d71
2828
github.com/fluxcd/pkg/ssa v0.45.1
2929
github.com/fluxcd/pkg/tar v0.11.0
3030
github.com/fluxcd/pkg/testserver v0.10.0
@@ -36,11 +36,11 @@ require (
3636
github.com/ory/dockertest/v3 v3.11.0
3737
github.com/spf13/pflag v1.0.6
3838
golang.org/x/net v0.35.0
39-
k8s.io/api v0.32.1
40-
k8s.io/apimachinery v0.32.1
41-
k8s.io/client-go v0.32.1
39+
k8s.io/api v0.32.2
40+
k8s.io/apimachinery v0.32.2
41+
k8s.io/client-go v0.32.2
4242
k8s.io/utils v0.0.0-20241210054802-24370beab758
43-
sigs.k8s.io/controller-runtime v0.20.1
43+
sigs.k8s.io/controller-runtime v0.20.2
4444
sigs.k8s.io/kustomize/api v0.19.0
4545
sigs.k8s.io/yaml v1.4.0
4646
)
@@ -130,7 +130,7 @@ require (
130130
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
131131
github.com/go-git/go-billy/v5 v5.6.2 // indirect
132132
github.com/go-git/go-git/v5 v5.13.2 // indirect
133-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
133+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
134134
github.com/go-logr/logr v1.4.2 // indirect
135135
github.com/go-logr/stdr v1.2.2 // indirect
136136
github.com/go-logr/zapr v1.3.0 // indirect
@@ -142,9 +142,9 @@ require (
142142
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
143143
github.com/golang/protobuf v1.5.4 // indirect
144144
github.com/google/btree v1.1.3 // indirect
145-
github.com/google/cel-go v0.23.1 // indirect
145+
github.com/google/cel-go v0.23.2 // indirect
146146
github.com/google/gnostic-models v0.6.9 // indirect
147-
github.com/google/go-cmp v0.6.0 // indirect
147+
github.com/google/go-cmp v0.7.0 // indirect
148148
github.com/google/gofuzz v1.2.0 // indirect
149149
github.com/google/s2a-go v0.1.9 // indirect
150150
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -194,7 +194,7 @@ require (
194194
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
195195
github.com/pkg/errors v0.9.1 // indirect
196196
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
197-
github.com/prometheus/client_golang v1.20.5 // indirect
197+
github.com/prometheus/client_golang v1.21.0 // indirect
198198
github.com/prometheus/client_model v0.6.1 // indirect
199199
github.com/prometheus/common v0.62.0 // indirect
200200
github.com/prometheus/procfs v0.15.1 // indirect
@@ -223,12 +223,12 @@ require (
223223
go.uber.org/zap v1.27.0 // indirect
224224
golang.org/x/crypto v0.33.0 // indirect
225225
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
226-
golang.org/x/oauth2 v0.25.0 // indirect
226+
golang.org/x/oauth2 v0.27.0 // indirect
227227
golang.org/x/sync v0.11.0 // indirect
228228
golang.org/x/sys v0.30.0 // indirect
229229
golang.org/x/term v0.29.0 // indirect
230230
golang.org/x/text v0.22.0 // indirect
231-
golang.org/x/time v0.9.0 // indirect
231+
golang.org/x/time v0.10.0 // indirect
232232
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
233233
google.golang.org/api v0.218.0 // indirect
234234
google.golang.org/genproto v0.0.0-20241223144023-3abc09e42ca8 // indirect
@@ -242,12 +242,12 @@ require (
242242
gopkg.in/warnings.v0 v0.1.2 // indirect
243243
gopkg.in/yaml.v2 v2.4.0 // indirect
244244
gopkg.in/yaml.v3 v3.0.1 // indirect
245-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
246-
k8s.io/cli-runtime v0.32.1 // indirect
247-
k8s.io/component-base v0.32.1 // indirect
245+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
246+
k8s.io/cli-runtime v0.32.2 // indirect
247+
k8s.io/component-base v0.32.2 // indirect
248248
k8s.io/klog/v2 v2.130.1 // indirect
249249
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
250-
k8s.io/kubectl v0.32.1 // indirect
250+
k8s.io/kubectl v0.32.2 // indirect
251251
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
252252
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
253253
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect

‎go.sum

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ github.com/fluxcd/pkg/http/fetch v0.15.0 h1:AJ1JuE2asuK4QMfbHjxctFURke5FvZtyljjI
187187
github.com/fluxcd/pkg/http/fetch v0.15.0/go.mod h1:feTESfETKU14jq+e/Ce8QnMBTCh9O79bLMSMe5t55fQ=
188188
github.com/fluxcd/pkg/kustomize v1.16.0 h1:UBOeIvkrC6y4owYs7vZwG5PUVFeqnRoDFN9eaNhuNPI=
189189
github.com/fluxcd/pkg/kustomize v1.16.0/go.mod h1:6yQkAZaG+w3nXY30LbyWRYHimjRcLRwlYkrwG0ygMSI=
190-
github.com/fluxcd/pkg/runtime v0.53.1 h1:S+QRSoiU+LH1sTvJLNvT1x3E5hBq/sjOsRHazA7OqTo=
191-
github.com/fluxcd/pkg/runtime v0.53.1/go.mod h1:8vkIhS1AhkmjC98LRm5xM+CRG5KySFTXpJWk+ZdtT4I=
190+
github.com/fluxcd/pkg/runtime v0.53.2-0.20250224201542-60bfc04a1d71 h1:56zAb3yrbZt8/u6E97HmCJl+S5mRVw63ktuS7v7qXoA=
191+
github.com/fluxcd/pkg/runtime v0.53.2-0.20250224201542-60bfc04a1d71/go.mod h1:PC73Yn/AaBQXnd2YYq0cnQqF3RmQKoM265crrjFJnKI=
192192
github.com/fluxcd/pkg/sourceignore v0.11.0 h1:xzpYmc5/t/Ck+/DkJSX3r+VbahDRIAn5kbv04fynWUo=
193193
github.com/fluxcd/pkg/sourceignore v0.11.0/go.mod h1:ri2FvlzX8ep2iszOK5gF/riYq2TNgpVvsfJ2QY0dLWI=
194194
github.com/fluxcd/pkg/ssa v0.45.1 h1:ISl84TJwRP/GuZXrKiR9Tf8JOnG5XFgtjcYoR4XQYf4=
@@ -215,8 +215,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
215215
github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
216216
github.com/go-git/go-git/v5 v5.13.2 h1:7O7xvsK7K+rZPKW6AQR1YyNhfywkv7B8/FsP3ki6Zv0=
217217
github.com/go-git/go-git/v5 v5.13.2/go.mod h1:hWdW5P4YZRjmpGHwRH2v3zkWcNl6HeXaXQEMGb3NJ9A=
218-
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
219-
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
218+
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
219+
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
220220
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
221221
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
222222
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -248,13 +248,13 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
248248
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
249249
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
250250
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
251-
github.com/google/cel-go v0.23.1 h1:91ThhEZlBcE5rB2adBVXqvDoqdL8BG2oyhd0bK1I/r4=
252-
github.com/google/cel-go v0.23.1/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo=
251+
github.com/google/cel-go v0.23.2 h1:UdEe3CvQh3Nv+E/j9r1Y//WO0K0cSyD7/y0bzyLIMI4=
252+
github.com/google/cel-go v0.23.2/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo=
253253
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
254254
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
255255
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
256-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
257-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
256+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
257+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
258258
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
259259
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
260260
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -388,8 +388,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
388388
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
389389
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
390390
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
391-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
392-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
391+
github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
392+
github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
393393
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
394394
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
395395
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -494,8 +494,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
494494
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
495495
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
496496
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
497-
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
498-
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
497+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
498+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
499499
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
500500
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
501501
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -517,8 +517,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
517517
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
518518
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
519519
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
520-
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
521-
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
520+
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
521+
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
522522
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
523523
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
524524
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -560,28 +560,28 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
560560
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
561561
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
562562
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
563-
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
564-
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
565-
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
566-
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
567-
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
568-
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
569-
k8s.io/cli-runtime v0.32.1 h1:19nwZPlYGJPUDbhAxDIS2/oydCikvKMHsxroKNGA2mM=
570-
k8s.io/cli-runtime v0.32.1/go.mod h1:NJPbeadVFnV2E7B7vF+FvU09mpwYlZCu8PqjzfuOnkY=
571-
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
572-
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
573-
k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk=
574-
k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w=
563+
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
564+
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
565+
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
566+
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
567+
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
568+
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
569+
k8s.io/cli-runtime v0.32.2 h1:aKQR4foh9qeyckKRkNXUccP9moxzffyndZAvr+IXMks=
570+
k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8=
571+
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
572+
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
573+
k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU=
574+
k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0=
575575
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
576576
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
577577
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
578578
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
579-
k8s.io/kubectl v0.32.1 h1:/btLtXLQUU1rWx8AEvX9jrb9LaI6yeezt3sFALhB8M8=
580-
k8s.io/kubectl v0.32.1/go.mod h1:sezNuyWi1STk4ZNPVRIFfgjqMI6XMf+oCVLjZen/pFQ=
579+
k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us=
580+
k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8=
581581
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
582582
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
583-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
584-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
583+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
584+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
585585
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
586586
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
587587
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=

‎internal/controller/kustomization_controller.go

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ type KustomizationReconciler struct {
9292

9393
Mapper apimeta.RESTMapper
9494
APIReader client.Reader
95-
StatusPoller *polling.StatusPoller
9695
PollingOpts polling.Options
9796
ControllerName string
9897
statusManager string
@@ -224,7 +223,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
224223
}
225224

226225
// Configure custom health checks.
227-
statusPoller, pollingOpts, err := r.getPollerAndOptions(ctx, obj)
226+
pollingOpts, err := r.getPollerOptions(ctx, obj)
228227
if err != nil {
229228
const msg = "Reconciliation failed terminally due to configuration error"
230229
errMsg := fmt.Sprintf("%s: %v", msg, err)
@@ -281,7 +280,7 @@ func (r *KustomizationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
281280
}
282281

283282
// Reconcile the latest revision.
284-
reconcileErr := r.reconcile(ctx, obj, artifactSource, patcher, statusPoller, pollingOpts)
283+
reconcileErr := r.reconcile(ctx, obj, artifactSource, patcher, pollingOpts)
285284

286285
// Requeue at the specified retry interval if the artifact tarball is not found.
287286
if errors.Is(reconcileErr, fetch.ErrFileNotFound) {
@@ -312,7 +311,6 @@ func (r *KustomizationReconciler) reconcile(
312311
obj *kustomizev1.Kustomization,
313312
src sourcev1.Source,
314313
patcher *patch.SerialPatcher,
315-
statusPoller *polling.StatusPoller,
316314
pollingOpts polling.Options) error {
317315
log := ctrl.LoggerFrom(ctx)
318316

@@ -382,7 +380,6 @@ func (r *KustomizationReconciler) reconcile(
382380
// Configure the Kubernetes client for impersonation.
383381
impersonation := runtimeClient.NewImpersonator(
384382
r.Client,
385-
statusPoller,
386383
pollingOpts,
387384
obj.Spec.KubeConfig,
388385
r.KubeConfigOpts,
@@ -1012,7 +1009,6 @@ func (r *KustomizationReconciler) finalize(ctx context.Context,
10121009

10131010
impersonation := runtimeClient.NewImpersonator(
10141011
r.Client,
1015-
r.StatusPoller,
10161012
r.PollingOpts,
10171013
obj.Spec.KubeConfig,
10181014
r.KubeConfigOpts,
@@ -1161,24 +1157,20 @@ func getOriginRevision(src sourcev1.Source) string {
11611157
return a.Metadata[OCIArtifactOriginRevisionAnnotation]
11621158
}
11631159

1164-
// getPollerAndOptions returns the status poller and polling options
1160+
// getPollerOptions returns the status poller options
11651161
// based on the healthcheck expressions defined in the Kustomization
11661162
// object spec.
1167-
func (r *KustomizationReconciler) getPollerAndOptions(ctx context.Context,
1168-
obj *kustomizev1.Kustomization) (*polling.StatusPoller, polling.Options, error) {
1169-
1170-
poller := r.StatusPoller
1163+
func (r *KustomizationReconciler) getPollerOptions(ctx context.Context,
1164+
obj *kustomizev1.Kustomization) (polling.Options, error) {
11711165
opts := r.PollingOpts
11721166

11731167
if hc := obj.Spec.HealthCheckExprs; len(hc) > 0 {
11741168
var err error
11751169
opts, err = cel.PollerWithCustomHealthChecks(ctx, opts, hc, r.Mapper)
11761170
if err != nil {
1177-
return nil, polling.Options{}, err
1171+
return polling.Options{}, err
11781172
}
1179-
1180-
poller = polling.NewStatusPoller(r.Client, r.Mapper, opts)
11811173
}
11821174

1183-
return poller, opts, nil
1175+
return opts, nil
11841176
}

‎main.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,13 @@ func main() {
214214

215215
metricsH := runtimeCtrl.NewMetrics(mgr, metrics.MustMakeRecorder(), kustomizev1.KustomizationFinalizer)
216216

217-
jobStatusReader := statusreaders.NewCustomJobStatusReader(mgr.GetRESTMapper())
217+
restMapper, err := runtimeClient.NewDynamicRESTMapper(mgr.GetConfig())
218+
if err != nil {
219+
setupLog.Error(err, "unable to create REST mapper")
220+
os.Exit(1)
221+
}
222+
223+
jobStatusReader := statusreaders.NewCustomJobStatusReader(restMapper)
218224
pollingOpts := polling.Options{
219225
CustomStatusReaders: []engine.StatusReader{jobStatusReader},
220226
}
@@ -244,7 +250,7 @@ func main() {
244250
ControllerName: controllerName,
245251
DefaultServiceAccount: defaultServiceAccount,
246252
Client: mgr.GetClient(),
247-
Mapper: mgr.GetRESTMapper(),
253+
Mapper: restMapper,
248254
APIReader: mgr.GetAPIReader(),
249255
Metrics: metricsH,
250256
EventRecorder: eventRecorder,
@@ -254,7 +260,6 @@ func main() {
254260
ConcurrentSSA: concurrentSSA,
255261
KubeConfigOpts: kubeConfigOpts,
256262
PollingOpts: pollingOpts,
257-
StatusPoller: polling.NewStatusPoller(mgr.GetClient(), mgr.GetRESTMapper(), pollingOpts),
258263
DisallowedFieldManagers: disallowedFieldManagers,
259264
StrictSubstitutions: strictSubstitutions,
260265
GroupChangeLog: groupChangeLog,

0 commit comments

Comments
 (0)