diff --git a/devel/cluster/create-kind.sh b/devel/cluster/create-kind.sh index 88d1e0952..6cd15f14e 100755 --- a/devel/cluster/create-kind.sh +++ b/devel/cluster/create-kind.sh @@ -48,6 +48,8 @@ elif [[ "$K8S_VERSION" =~ 1\.23 ]]; then KIND_IMAGE=$KIND_IMAGE_K8S_123 elif [[ "$K8S_VERSION" =~ 1\.24 ]]; then KIND_IMAGE=$KIND_IMAGE_K8S_124 +elif [[ "$K8S_VERSION" =~ 1\.25 ]]; then + KIND_IMAGE=$KIND_IMAGE_K8S_125 else echo "Unrecognised/unsupported Kubernetes version '${K8S_VERSION}'! Aborting..." exit 1 diff --git a/devel/cluster/kind_cluster_node_versions.sh b/devel/cluster/kind_cluster_node_versions.sh index f8a5bdbbf..a1ce0df6d 100644 --- a/devel/cluster/kind_cluster_node_versions.sh +++ b/devel/cluster/kind_cluster_node_versions.sh @@ -13,33 +13,38 @@ # limitations under the License. # generated by ./hack/latest-kind-images.sh -# 1.24 image SHA has been edited by hand to match that recommended to be used with kind 0.14 https://github.com/kubernetes-sigs/kind/releases/tag/v0.14.0 -KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 -KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 -KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 -KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae -KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe +KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 +KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 +KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a +KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 +KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace # docker.io/kindest/node:v1.20.15 -KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 +KIND_IMAGE_SHA_K8S_120=sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe -# docker.io/kindest/node:v1.21.12 -KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 +# docker.io/kindest/node:v1.21.14 +KIND_IMAGE_SHA_K8S_121=sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 -# docker.io/kindest/node:v1.22.9 -KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 +# docker.io/kindest/node:v1.22.15 +KIND_IMAGE_SHA_K8S_122=sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 -# docker.io/kindest/node:v1.23.6 -KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae +# docker.io/kindest/node:v1.23.12 +KIND_IMAGE_SHA_K8S_123=sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a -# docker.io/kindest/node:v1.24.0 -KIND_IMAGE_SHA_K8S_124=sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +# docker.io/kindest/node:v1.24.6 +KIND_IMAGE_SHA_K8S_124=sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 + +# docker.io/kindest/node:v1.25.2 +KIND_IMAGE_SHA_K8S_125=sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 -KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 -KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 -KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae -KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe +KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.14@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 +KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 +KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a +KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 +KIND_IMAGE_FULL_K8S_125=docker.io/kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace + diff --git a/hack/latest-kind-images.sh b/hack/latest-kind-images.sh index bda228ad2..2ca529526 100755 --- a/hack/latest-kind-images.sh +++ b/hack/latest-kind-images.sh @@ -53,6 +53,7 @@ LATEST_121_TAG=$(latest_kind_tag "1\\.21") LATEST_122_TAG=$(latest_kind_tag "1\\.22") LATEST_123_TAG=$(latest_kind_tag "1\\.23") LATEST_124_TAG=$(latest_kind_tag "1\\.24") +LATEST_125_TAG=$(latest_kind_tag "1\\.25") LATEST_120_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_120_TAG) @@ -60,6 +61,7 @@ LATEST_121_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_121_TAG) LATEST_122_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_122_TAG) LATEST_123_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_123_TAG) LATEST_124_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_124_TAG) +LATEST_125_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_125_TAG) cat << EOF | tee ./devel/cluster/kind_cluster_node_versions.sh > ./make/kind_images.sh # Copyright 2022 The cert-manager Authors. @@ -83,6 +85,7 @@ KIND_IMAGE_K8S_121=$KIND_IMAGE_REPO@$LATEST_121_DIGEST KIND_IMAGE_K8S_122=$KIND_IMAGE_REPO@$LATEST_122_DIGEST KIND_IMAGE_K8S_123=$KIND_IMAGE_REPO@$LATEST_123_DIGEST KIND_IMAGE_K8S_124=$KIND_IMAGE_REPO@$LATEST_124_DIGEST +KIND_IMAGE_K8S_125=$KIND_IMAGE_REPO@$LATEST_125_DIGEST # $KIND_IMAGE_REPO:$LATEST_120_TAG KIND_IMAGE_SHA_K8S_120=$LATEST_120_DIGEST @@ -99,6 +102,9 @@ KIND_IMAGE_SHA_K8S_123=$LATEST_123_DIGEST # $KIND_IMAGE_REPO:$LATEST_124_TAG KIND_IMAGE_SHA_K8S_124=$LATEST_124_DIGEST +# $KIND_IMAGE_REPO:$LATEST_125_TAG +KIND_IMAGE_SHA_K8S_125=$LATEST_125_DIGEST + # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead KIND_IMAGE_FULL_K8S_120=$KIND_IMAGE_REPO:$LATEST_120_TAG@$LATEST_120_DIGEST @@ -106,6 +112,7 @@ KIND_IMAGE_FULL_K8S_121=$KIND_IMAGE_REPO:$LATEST_121_TAG@$LATEST_121_DIGEST KIND_IMAGE_FULL_K8S_122=$KIND_IMAGE_REPO:$LATEST_122_TAG@$LATEST_122_DIGEST KIND_IMAGE_FULL_K8S_123=$KIND_IMAGE_REPO:$LATEST_123_TAG@$LATEST_123_DIGEST KIND_IMAGE_FULL_K8S_124=$KIND_IMAGE_REPO:$LATEST_124_TAG@$LATEST_124_DIGEST +KIND_IMAGE_FULL_K8S_125=$KIND_IMAGE_REPO:$LATEST_125_TAG@$LATEST_125_DIGEST EOF diff --git a/make/cluster.sh b/make/cluster.sh index dedb5a489..5383d1356 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.24 +k8s_version=1.25 kind_cluster_name=kind help() { @@ -109,6 +109,7 @@ case "$k8s_version" in 1.22*) image=$KIND_IMAGE_FULL_K8S_122 ;; 1.23*) image=$KIND_IMAGE_FULL_K8S_123 ;; 1.24*) image=$KIND_IMAGE_FULL_K8S_124 ;; +1.25*) image=$KIND_IMAGE_FULL_K8S_125 ;; 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/kind_images.sh b/make/kind_images.sh index f8a5bdbbf..a1ce0df6d 100644 --- a/make/kind_images.sh +++ b/make/kind_images.sh @@ -13,33 +13,38 @@ # limitations under the License. # generated by ./hack/latest-kind-images.sh -# 1.24 image SHA has been edited by hand to match that recommended to be used with kind 0.14 https://github.com/kubernetes-sigs/kind/releases/tag/v0.14.0 -KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 -KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 -KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 -KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae -KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe +KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 +KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 +KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a +KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 +KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace # docker.io/kindest/node:v1.20.15 -KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 +KIND_IMAGE_SHA_K8S_120=sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe -# docker.io/kindest/node:v1.21.12 -KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 +# docker.io/kindest/node:v1.21.14 +KIND_IMAGE_SHA_K8S_121=sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 -# docker.io/kindest/node:v1.22.9 -KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 +# docker.io/kindest/node:v1.22.15 +KIND_IMAGE_SHA_K8S_122=sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 -# docker.io/kindest/node:v1.23.6 -KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae +# docker.io/kindest/node:v1.23.12 +KIND_IMAGE_SHA_K8S_123=sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a -# docker.io/kindest/node:v1.24.0 -KIND_IMAGE_SHA_K8S_124=sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +# docker.io/kindest/node:v1.24.6 +KIND_IMAGE_SHA_K8S_124=sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 + +# docker.io/kindest/node:v1.25.2 +KIND_IMAGE_SHA_K8S_125=sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 -KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 -KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 -KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae -KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e +KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe +KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.14@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301 +KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586 +KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a +KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1 +KIND_IMAGE_FULL_K8S_125=docker.io/kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace +