Skip to content

Commit ed16c37

Browse files
matheuscscpmatheuscscp
authored
Merge pull request #1379 from fluxcd/backport-1377-to-release/v1.5.x
[release/v1.5.x] Use the dynamic RESTMapper from controller-runtime v0.19
2 parents 9ac2bba + 7c6555d commit ed16c37

File tree

9 files changed

+2782
-87
lines changed

9 files changed

+2782
-87
lines changed

‎api/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.23.0
55
require (
66
github.com/fluxcd/pkg/apis/kustomize v1.9.0
77
github.com/fluxcd/pkg/apis/meta v1.10.0
8-
k8s.io/apiextensions-apiserver v0.32.1
9-
k8s.io/apimachinery v0.32.1
10-
sigs.k8s.io/controller-runtime v0.20.1
8+
k8s.io/apiextensions-apiserver v0.32.2
9+
k8s.io/apimachinery v0.32.2
10+
sigs.k8s.io/controller-runtime v0.20.2
1111
)
1212

1313
// Fix CVE-2022-28948
@@ -24,8 +24,8 @@ require (
2424
github.com/modern-go/reflect2 v1.0.2 // indirect
2525
github.com/rogpeppe/go-internal v1.12.0 // indirect
2626
github.com/x448/float16 v0.8.4 // indirect
27-
golang.org/x/net v0.34.0 // indirect
28-
golang.org/x/text v0.21.0 // indirect
27+
golang.org/x/net v0.35.0 // indirect
28+
golang.org/x/text v0.22.0 // indirect
2929
gopkg.in/inf.v0 v0.9.1 // indirect
3030
k8s.io/klog/v2 v2.130.1 // indirect
3131
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

‎api/go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
3636
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
3737
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
3838
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
39-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
40-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
41-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
42-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
39+
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
40+
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
41+
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
42+
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
4343
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
4444
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4545
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
@@ -66,20 +66,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
6666
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6767
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6868
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
69-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
70-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
69+
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
70+
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
7171
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7272
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7373
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7474
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7575
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7676
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
77-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
78-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
77+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
78+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
7979
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
8080
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
81-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
82-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
81+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
82+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
8383
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
8484
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8585
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -97,18 +97,18 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
9797
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
9898
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9999
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100-
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
101-
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
102-
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
103-
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
104-
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
105-
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
100+
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
101+
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
102+
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
103+
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
104+
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
105+
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
106106
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
107107
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
108108
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
109109
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
110-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
111-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
110+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
111+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
112112
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
113113
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
114114
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎go.mod

+15-15
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.54.0
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

0 commit comments

Comments
 (0)