diff --git a/Makefile b/Makefile index c61211617927..1910cddfb779 100644 --- a/Makefile +++ b/Makefile @@ -207,7 +207,7 @@ clientgen: ensure-gopath .PHONY: clidocsgen clidocsgen: ensure-gopath - go run tools/cmd-docs/main.go + go run tools/cmd-docs/main.go .PHONY: codegen-local diff --git a/docs/operator-manual/upgrading/2.4-2.5.md b/docs/operator-manual/upgrading/2.4-2.5.md new file mode 100644 index 000000000000..a9d9348007cd --- /dev/null +++ b/docs/operator-manual/upgrading/2.4-2.5.md @@ -0,0 +1,5 @@ +# v2.4 to 2.5 + +## Upgraded Kustomize Version + +Note that bundled Kustomize version has been upgraded from 4.4.1 to 4.5.5. diff --git a/hack/generate-proto.sh b/hack/generate-proto.sh index 232ef126dcf4..713011991010 100755 --- a/hack/generate-proto.sh +++ b/hack/generate-proto.sh @@ -43,7 +43,7 @@ if [ -d /dist/protoc-include ]; then # containerized codegen build protoc_include=/dist/protoc-include else - # local codegen build + # local codegen build protoc_include=${PROJECT_ROOT}/dist/protoc-include fi diff --git a/hack/installers/checksums/kustomize_4.2.0_darwin_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.2.0_darwin_arm64.tar.gz.sha256 index d0a605ed11b4..fbfb4d12c098 100644 --- a/hack/installers/checksums/kustomize_4.2.0_darwin_arm64.tar.gz.sha256 +++ b/hack/installers/checksums/kustomize_4.2.0_darwin_arm64.tar.gz.sha256 @@ -1 +1 @@ -7ad70475fe5684f7150f7f1825df5f17652ec812fa65129b756000e9a6b49fff kustomize_4.2.0_darwin_arm64.tar.gz \ No newline at end of file +7ad70475fe5684f7150f7f1825df5f17652ec812fa65129b756000e9a6b49fff kustomize_4.2.0_darwin_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.2.0_linux_amd64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.2.0_linux_amd64.tar.gz.sha256 index d86b13c0f405..3b737e1546bc 100644 --- a/hack/installers/checksums/kustomize_4.2.0_linux_amd64.tar.gz.sha256 +++ b/hack/installers/checksums/kustomize_4.2.0_linux_amd64.tar.gz.sha256 @@ -1 +1 @@ -220dd03dcda8e45dc50e4e42b2d71882cbc4c05e0ed863513e67930ecad939eb kustomize_4.2.0_linux_amd64.tar.gz \ No newline at end of file +220dd03dcda8e45dc50e4e42b2d71882cbc4c05e0ed863513e67930ecad939eb kustomize_4.2.0_linux_amd64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.2.0_linux_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.2.0_linux_arm64.tar.gz.sha256 index de3d17680853..f3d182fd75bb 100644 --- a/hack/installers/checksums/kustomize_4.2.0_linux_arm64.tar.gz.sha256 +++ b/hack/installers/checksums/kustomize_4.2.0_linux_arm64.tar.gz.sha256 @@ -1 +1 @@ -33f2cf3b5db64c09560c187224e9d29452fde2b7f00f85941604fc75d9769e4a kustomize_4.2.0_linux_arm64.tar.gz \ No newline at end of file +33f2cf3b5db64c09560c187224e9d29452fde2b7f00f85941604fc75d9769e4a kustomize_4.2.0_linux_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.4.1_darwin_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.4.1_darwin_arm64.tar.gz.sha256 index 9205bd2b6256..5216b40c4ff0 100644 --- a/hack/installers/checksums/kustomize_4.4.1_darwin_arm64.tar.gz.sha256 +++ b/hack/installers/checksums/kustomize_4.4.1_darwin_arm64.tar.gz.sha256 @@ -1 +1 @@ -689d873b30dc052a51e737eaf20a416e1a72a6d8f85e5d9c4969515fa2ad578c kustomize_4.4.1_darwin_arm64.tar.gz \ No newline at end of file +689d873b30dc052a51e737eaf20a416e1a72a6d8f85e5d9c4969515fa2ad578c kustomize_4.4.1_darwin_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_darwin_amd64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_darwin_amd64.tar.gz.sha256 new file mode 100644 index 000000000000..58ef5a5b1d28 --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_darwin_amd64.tar.gz.sha256 @@ -0,0 +1 @@ +f604eaf1083659cd46aaffcc81bf13351a76a2d245823e2345dbb8b840622bde kustomize_4.5.5_darwin_amd64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_darwin_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_darwin_arm64.tar.gz.sha256 new file mode 100644 index 000000000000..9d4ba93070e3 --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_darwin_arm64.tar.gz.sha256 @@ -0,0 +1 @@ +dbb9558d4ab0db27d9bf41f72eda8652fc07ee3fb70fd5b303c770c711283205 kustomize_4.5.5_darwin_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_linux_amd64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_linux_amd64.tar.gz.sha256 new file mode 100644 index 000000000000..8f07027b28f9 --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_linux_amd64.tar.gz.sha256 @@ -0,0 +1 @@ +bba81aa61dba057db1d5abeddf1e522b568b2d906ab67a5c80935e97302c8773 kustomize_4.5.5_linux_amd64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_linux_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_linux_arm64.tar.gz.sha256 new file mode 100644 index 000000000000..d5fb033fe3e9 --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_linux_arm64.tar.gz.sha256 @@ -0,0 +1 @@ +c491191b81c97ddebc4844f9254683ecfc80f40dfb15510433cbfdaeb86627c3 kustomize_4.5.5_linux_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_linux_ppc64le.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_linux_ppc64le.tar.gz.sha256 new file mode 100644 index 000000000000..99b8d2ffc906 --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_linux_ppc64le.tar.gz.sha256 @@ -0,0 +1 @@ +700008a6f99270e17acf6a3562377e6b8f60b18a869538d673b05a30bbaf4419 kustomize_4.5.5_linux_ppc64le.tar.gz diff --git a/hack/installers/checksums/kustomize_4.5.5_linux_s390x.tar.gz.sha256 b/hack/installers/checksums/kustomize_4.5.5_linux_s390x.tar.gz.sha256 new file mode 100644 index 000000000000..d9a5a5f5d06f --- /dev/null +++ b/hack/installers/checksums/kustomize_4.5.5_linux_s390x.tar.gz.sha256 @@ -0,0 +1 @@ +3a5d406c1ea0b37aec12a094997f8ac1a620499aa7069d2cd8563b4b02441e22 kustomize_4.5.5_linux_s390x.tar.gz diff --git a/hack/installers/checksums/protoc_3.17.3_linux_arm64.zip.sha256 b/hack/installers/checksums/protoc_3.17.3_linux_arm64.zip.sha256 index f00d9178e532..bb618b7383cc 100644 --- a/hack/installers/checksums/protoc_3.17.3_linux_arm64.zip.sha256 +++ b/hack/installers/checksums/protoc_3.17.3_linux_arm64.zip.sha256 @@ -1 +1 @@ -ceb29d4890a31ba871829d22c2b7fa28f237d2b91ce4ea2a53e893d60a1cd502 protoc_3.17.3_linux_arm64.zip \ No newline at end of file +ceb29d4890a31ba871829d22c2b7fa28f237d2b91ce4ea2a53e893d60a1cd502 protoc_3.17.3_linux_arm64.zip diff --git a/hack/installers/install-codegen-tools.sh b/hack/installers/install-codegen-tools.sh index eda5699259e7..82e45bab4bfc 100755 --- a/hack/installers/install-codegen-tools.sh +++ b/hack/installers/install-codegen-tools.sh @@ -1,4 +1,4 @@ #!/bin/bash set -eux -o pipefail -KUSTOMIZE_VERSION=4.4.1 "$(dirname $0)/../install.sh" kustomize protoc +KUSTOMIZE_VERSION=4.5.5 "$(dirname $0)/../install.sh" kustomize protoc diff --git a/hack/tool-versions.sh b/hack/tool-versions.sh index 4555fece2b9d..14b97a5fd6e8 100644 --- a/hack/tool-versions.sh +++ b/hack/tool-versions.sh @@ -12,5 +12,5 @@ awscliv2_version=2.4.6 helm3_version=3.9.0 kubectl_version=1.17.8 kubectx_version=0.6.3 -kustomize4_version=4.4.1 +kustomize4_version=4.5.5 protoc_version=3.17.3