From 28eaf8754efc2f34f830fa2156c5d60a3c84c671 Mon Sep 17 00:00:00 2001 From: cert-manager-bot Date: Tue, 14 May 2024 12:15:16 +0000 Subject: [PATCH 1/2] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: cert-manager-bot --- klone.yaml | 14 +++++++------- make/_shared/tools/00_mod.mk | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/klone.yaml b/klone.yaml index fd4e5a533..3dcee7dee 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,35 +10,35 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/boilerplate - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/go - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/help - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/klone - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: b6dc86973e937be38a138f38cf83134760487f26 + repo_hash: e44cf74061351e8e463a786e47daacd98f4eab60 repo_path: modules/tools diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index 6807190b6..3d296b67d 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -50,7 +50,7 @@ tools += helm=v3.14.4 # https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl tools += kubectl=v1.30.0 # https://github.com/kubernetes-sigs/kind/releases -tools += kind=v0.22.0 +tools += kind=v0.23.0 # https://www.vaultproject.io/downloads tools += vault=1.16.2 # https://github.com/Azure/azure-workload-identity/releases @@ -399,10 +399,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO $(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \ chmod +x $(outfile) -kind_linux_amd64_SHA256SUM=e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62 -kind_linux_arm64_SHA256SUM=4431805115da3b54290e3e976fe2db9a7e703f116177aace6735dfa1d8a4f3fe -kind_darwin_amd64_SHA256SUM=28a9f7ad7fd77922c639e21c034d0f989b33402693f4f842099cd9185b144d20 -kind_darwin_arm64_SHA256SUM=c8dd3b287965150ae4db668294edc48229116e95d94620c306d8fae932ee633f +kind_linux_amd64_SHA256SUM=1d86e3069ffbe3da9f1a918618aecbc778e00c75f838882d0dfa2d363bc4a68c +kind_linux_arm64_SHA256SUM=a416d6c311882337f0e56910e4a2e1f8c106ec70c22cbf0ac1dd8f33c1e284fe +kind_darwin_amd64_SHA256SUM=81c77f104b4b668812f7930659dc01ad88fa4d1cfc56900863eacdfb2731c457 +kind_darwin_arm64_SHA256SUM=68ec87c1e1ea2a708df883f4b94091150d19552d7b344e80ca59f449b301c2a0 .PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH) $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools From 11431419877d9f01d9c093ba1277c044a19426ea Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Tue, 14 May 2024 11:28:55 +0100 Subject: [PATCH 2/2] bump kind images to latest for v0.23.0, use K8s v1.30.0 by default Also removes support for old K8s versions unsupported by Kind v0.23.0 Signed-off-by: Ashley Davis --- hack/latest-kind-images.sh | 2 +- make/cluster.sh | 6 ++---- make/e2e-setup.mk | 2 +- make/kind_images.sh | 15 +++++++-------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hack/latest-kind-images.sh b/hack/latest-kind-images.sh index 175fb77a9..6581585b7 100755 --- a/hack/latest-kind-images.sh +++ b/hack/latest-kind-images.sh @@ -41,7 +41,7 @@ cp ./hack/boilerplate-sh.txt ./make/kind_images.sh.tmp cat << EOF >> ./make/kind_images.sh.tmp -# generated by "$0 $@" via "make update-kind-images" +# generated by "$0 $@" EOF diff --git a/make/cluster.sh b/make/cluster.sh index 156a50606..759903e52 100755 --- a/make/cluster.sh +++ b/make/cluster.sh @@ -25,7 +25,7 @@ set -e source ./make/kind_images.sh mode=kind -k8s_version=1.28 +k8s_version=1.30 name=kind help() { @@ -105,14 +105,12 @@ if printenv K8S_VERSION >/dev/null && [ -n "$K8S_VERSION" ]; then fi case "$k8s_version" in -1.22*) image=$KIND_IMAGE_K8S_122 ;; -1.23*) image=$KIND_IMAGE_K8S_123 ;; -1.24*) image=$KIND_IMAGE_K8S_124 ;; 1.25*) image=$KIND_IMAGE_K8S_125 ;; 1.26*) image=$KIND_IMAGE_K8S_126 ;; 1.27*) image=$KIND_IMAGE_K8S_127 ;; 1.28*) image=$KIND_IMAGE_K8S_128 ;; 1.29*) image=$KIND_IMAGE_K8S_129 ;; +1.30*) image=$KIND_IMAGE_K8S_130 ;; v*) printf "${red}${redcross}Error${end}: Kubernetes version must be given without the leading 'v'\n" >&2 && exit 1 ;; *) printf "${red}${redcross}Error${end}: unsupported Kubernetes version ${yel}${k8s_version}${end}\n" >&2 && exit 1 ;; esac diff --git a/make/e2e-setup.mk b/make/e2e-setup.mk index e51ded52d..a24780c98 100644 --- a/make/e2e-setup.mk +++ b/make/e2e-setup.mk @@ -24,7 +24,7 @@ CRI_ARCH := $(HOST_ARCH) # TODO: this version is also defaulted in ./make/cluster.sh. Make it so that it # is set in one place only. -K8S_VERSION := 1.28 +K8S_VERSION := 1.30 IMAGE_ingressnginx_amd64 := registry.k8s.io/ingress-nginx/controller:v1.9.4@sha256:0115d7e01987c13e1be90b09c223c3e0d8e9a92e97c0421e712ad3577e2d78e5 IMAGE_kyverno_amd64 := ghcr.io/kyverno/kyverno:v1.10.3@sha256:031d2da484f3d89c78007cbb1cf1d7ae992e069683a2cdca0a0efb63a63fc735 diff --git a/make/kind_images.sh b/make/kind_images.sh index 242c941ae..87ef7bb30 100755 --- a/make/kind_images.sh +++ b/make/kind_images.sh @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# generated by "./hack/latest-kind-images.sh v0.21.0" via "make update-kind-images" +# generated by "./hack/latest-kind-images.sh v0.23.0" -KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:fbb92ac580fce498473762419df27fa8664dbaa1c5a361b5957e123b4035bdcf -KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:ea292d57ec5dd0e2f3f5a2d77efa246ac883c051ff80e887109fabefbd3125c7 -KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:9d0a62b55d4fe1e262953be8d406689b947668626a357b5f9d0cfbddbebbc727 -KIND_IMAGE_K8S_126=docker.io/kindest/node@sha256:15ae92d507b7d4aec6e8920d358fc63d3b980493db191d7327541fbaaed1f789 -KIND_IMAGE_K8S_127=docker.io/kindest/node@sha256:3700c811144e24a6c6181065265f69b9bf0b437c45741017182d7c82b908918f -KIND_IMAGE_K8S_128=docker.io/kindest/node@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b -KIND_IMAGE_K8S_129=docker.io/kindest/node@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 +KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b +KIND_IMAGE_K8S_126=docker.io/kindest/node@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19 +KIND_IMAGE_K8S_127=docker.io/kindest/node@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8 +KIND_IMAGE_K8S_128=docker.io/kindest/node@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0 +KIND_IMAGE_K8S_129=docker.io/kindest/node@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8 +KIND_IMAGE_K8S_130=docker.io/kindest/node@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e