Skip to content

Commit 935ed4b

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

File tree

3 files changed

+81
-16
lines changed

3 files changed

+81
-16
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

+59-1
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,69 @@ require (
232232
gopkg.in/warnings.v0 v0.1.2 // indirect
233233
gopkg.in/yaml.v3 v3.0.1 // indirect
234234
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
235-
k8s.io/kubectl v0.32.1 // indirect
235+
k8s.io/kubectl v0.32.2 // indirect
236236
oras.land/oras-go v1.2.5 // indirect
237237
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
238238
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
239239
sigs.k8s.io/kustomize/api v0.18.0 // indirect
240240
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
241241
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
242242
)
243+
244+
replace k8s.io/api => k8s.io/api v0.32.1
245+
246+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
247+
248+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
249+
250+
replace k8s.io/apiserver => k8s.io/apiserver v0.32.1
251+
252+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1
253+
254+
replace k8s.io/client-go => k8s.io/client-go v0.32.1
255+
256+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1
257+
258+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1
259+
260+
replace k8s.io/code-generator => k8s.io/code-generator v0.32.1
261+
262+
replace k8s.io/component-base => k8s.io/component-base v0.32.1
263+
264+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
265+
266+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.1
267+
268+
replace k8s.io/cri-api => k8s.io/cri-api v0.32.1
269+
270+
replace k8s.io/cri-client => k8s.io/cri-client v0.32.1
271+
272+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1
273+
274+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1
275+
276+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.1
277+
278+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.1
279+
280+
replace k8s.io/kms => k8s.io/kms v0.32.1
281+
282+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1
283+
284+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1
285+
286+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1
287+
288+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1
289+
290+
replace k8s.io/kubectl => k8s.io/kubectl v0.32.1
291+
292+
replace k8s.io/kubelet => k8s.io/kubelet v0.32.1
293+
294+
replace k8s.io/metrics => k8s.io/metrics v0.32.1
295+
296+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.1
297+
298+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.1
299+
300+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1

‎go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -712,20 +712,20 @@ 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=
731731
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=

0 commit comments

Comments
 (0)