Skip to content

Commit 5daa74d

Browse files
camilamacedo86camilamacedo86
committed
Add replacements for k8s apis and makefile target to ensure those are upgraded
1 parent 66b97ad commit 5daa74d

File tree

3 files changed

+93
-25
lines changed

3 files changed

+93
-25
lines changed

‎Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,16 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI
151151
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
152152

153153
.PHONY: verify
154-
verify: tidy fmt generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date.
154+
verify: tidy fmt generate manifests crd-ref-docs update-k8s-replaces #HELP Verify all generated code is up-to-date.
155155
git diff --exit-code
156156

157+
.PHONY: update-k8s-replaces
158+
update-k8s-replaces:
159+
@K8S_VER=$$(go mod graph | grep 'sigs.k8s.io/controller-runtime' | grep 'k8s.io/api@' | awk '{print $$2}' | sed -E 's/^k8s.io\/api@//g' | sort -u | head -n 1); \
160+
sed -E -i.bak "/replace k8s.io\//s| v[0-9]+\.[0-9]+\.[0-9]+$$| $$K8S_VER|g" go.mod; \
161+
rm -f go.mod.bak; \
162+
go mod tidy \
163+
157164
.PHONY: fix-lint
158165
fix-lint: $(GOLANGCI_LINT) #EXHELP Fix lint issues
159166
$(GOLANGCI_LINT) run --fix --build-tags $(GO_BUILD_TAGS) $(GOLANGCI_LINT_ARGS)

‎go.mod

+65-4
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ require (
2626
github.com/stretchr/testify v1.10.0
2727
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7
2828
golang.org/x/sync v0.12.0
29-
golang.org/x/tools v0.31.0
29+
golang.org/x/tools v0.30.0
3030
gopkg.in/yaml.v2 v2.4.0
3131
helm.sh/helm/v3 v3.17.1
3232
k8s.io/api v0.32.2
3333
k8s.io/apiextensions-apiserver v0.32.2
3434
k8s.io/apimachinery v0.32.2
3535
k8s.io/apiserver v0.32.2
36-
k8s.io/cli-runtime v0.32.2
36+
k8s.io/cli-runtime v0.32.1
3737
k8s.io/client-go v0.32.2
3838
k8s.io/component-base v0.32.2
3939
k8s.io/klog/v2 v2.130.1
@@ -42,6 +42,11 @@ require (
4242
sigs.k8s.io/yaml v1.4.0
4343
)
4444

45+
require (
46+
golang.org/x/mod v0.23.0 // indirect
47+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
48+
)
49+
4550
require (
4651
cel.dev/expr v0.18.0 // indirect
4752
dario.cat/mergo v1.0.1 // indirect
@@ -214,7 +219,6 @@ require (
214219
go.opentelemetry.io/otel/trace v1.33.0 // indirect
215220
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
216221
golang.org/x/crypto v0.36.0 // indirect
217-
golang.org/x/mod v0.24.0 // indirect
218222
golang.org/x/net v0.37.0 // indirect
219223
golang.org/x/oauth2 v0.27.0 // indirect
220224
golang.org/x/sys v0.31.0 // indirect
@@ -231,7 +235,6 @@ require (
231235
gopkg.in/inf.v0 v0.9.1 // indirect
232236
gopkg.in/warnings.v0 v0.1.2 // indirect
233237
gopkg.in/yaml.v3 v3.0.1 // indirect
234-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
235238
k8s.io/kubectl v0.32.1 // indirect
236239
oras.land/oras-go v1.2.5 // indirect
237240
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
@@ -240,3 +243,61 @@ require (
240243
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
241244
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
242245
)
246+
247+
replace k8s.io/api => k8s.io/api v0.32.1
248+
249+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
250+
251+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
252+
253+
replace k8s.io/apiserver => k8s.io/apiserver v0.32.1
254+
255+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1
256+
257+
replace k8s.io/client-go => k8s.io/client-go v0.32.1
258+
259+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1
260+
261+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1
262+
263+
replace k8s.io/code-generator => k8s.io/code-generator v0.32.1
264+
265+
replace k8s.io/component-base => k8s.io/component-base v0.32.1
266+
267+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
268+
269+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.1
270+
271+
replace k8s.io/cri-api => k8s.io/cri-api v0.32.1
272+
273+
replace k8s.io/cri-client => k8s.io/cri-client v0.32.1
274+
275+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1
276+
277+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1
278+
279+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.1
280+
281+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.1
282+
283+
replace k8s.io/kms => k8s.io/kms v0.32.1
284+
285+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1
286+
287+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1
288+
289+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1
290+
291+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1
292+
293+
replace k8s.io/kubectl => k8s.io/kubectl v0.32.1
294+
295+
replace k8s.io/kubelet => k8s.io/kubelet v0.32.1
296+
297+
replace k8s.io/metrics => k8s.io/metrics v0.32.1
298+
299+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.1
300+
301+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.1
302+
303+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1

‎go.sum

+20-20
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
597597
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
598598
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
599599
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
600-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
601-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
600+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
601+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
602602
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
603603
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
604604
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -652,8 +652,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
652652
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
653653
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
654654
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
655-
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
656-
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
655+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
656+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
657657
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
658658
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
659659
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -712,24 +712,24 @@ helm.sh/helm/v3 v3.17.1 h1:gzVoAD+qVuoJU6KDMSAeo0xRJ6N1znRxz3wyuXRmJDk=
712712
helm.sh/helm/v3 v3.17.1/go.mod h1:nvreuhuR+j78NkQcLC3TYoprCKStLyw5P4T7E5itv2w=
713713
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
714714
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
715-
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
716-
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
717-
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
718-
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
719-
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
720-
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
721-
k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw=
722-
k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM=
723-
k8s.io/cli-runtime v0.32.2 h1:aKQR4foh9qeyckKRkNXUccP9moxzffyndZAvr+IXMks=
724-
k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8=
725-
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
726-
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
727-
k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU=
728-
k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0=
715+
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
716+
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
717+
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
718+
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
719+
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
720+
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
721+
k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak=
722+
k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw=
723+
k8s.io/cli-runtime v0.32.1 h1:19nwZPlYGJPUDbhAxDIS2/oydCikvKMHsxroKNGA2mM=
724+
k8s.io/cli-runtime v0.32.1/go.mod h1:NJPbeadVFnV2E7B7vF+FvU09mpwYlZCu8PqjzfuOnkY=
725+
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
726+
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
727+
k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk=
728+
k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w=
729729
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
730730
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
731-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
732-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
731+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
732+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
733733
k8s.io/kubectl v0.32.1 h1:/btLtXLQUU1rWx8AEvX9jrb9LaI6yeezt3sFALhB8M8=
734734
k8s.io/kubectl v0.32.1/go.mod h1:sezNuyWi1STk4ZNPVRIFfgjqMI6XMf+oCVLjZen/pFQ=
735735
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=

0 commit comments

Comments
 (0)