From de8e9b07b38f0e5b0acb114fc5898b76c665d8de Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Tue, 16 Jan 2024 16:05:02 +0000 Subject: [PATCH] Remove KIND_IMAGE_FULL_ variables and use KIND_IMAGE_K8S_ instead Simplifies the latest-kind-images.sh script and the kind-images.sh variables. Signed-off-by: Richard Wall --- hack/latest-kind-images.sh | 11 ----------- make/cluster.sh | 19 ++++++++----------- make/kind_images.sh | 12 ------------ 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/hack/latest-kind-images.sh b/hack/latest-kind-images.sh index 0f12067eb..5fdddb66a 100755 --- a/hack/latest-kind-images.sh +++ b/hack/latest-kind-images.sh @@ -116,17 +116,6 @@ KIND_IMAGE_SHA_K8S_128=$LATEST_128_DIGEST # $KIND_IMAGE_REPO:$LATEST_129_TAG KIND_IMAGE_SHA_K8S_129=$LATEST_129_DIGEST -# note that these 'full' digests should be avoided since not all tools support them -# prefer KIND_IMAGE_K8S_*** instead -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 -KIND_IMAGE_FULL_K8S_126=$KIND_IMAGE_REPO:$LATEST_126_TAG@$LATEST_126_DIGEST -KIND_IMAGE_FULL_K8S_127=$KIND_IMAGE_REPO:$LATEST_127_TAG@$LATEST_127_DIGEST -KIND_IMAGE_FULL_K8S_128=$KIND_IMAGE_REPO:$LATEST_128_TAG@$LATEST_128_DIGEST -KIND_IMAGE_FULL_K8S_129=$KIND_IMAGE_REPO:$LATEST_129_TAG@$LATEST_129_DIGEST - EOF cat << EOF diff --git a/make/cluster.sh b/make/cluster.sh index 52903cf31..df0e8223e 100755 --- a/make/cluster.sh +++ b/make/cluster.sh @@ -104,18 +104,15 @@ if printenv K8S_VERSION >/dev/null && [ -n "$K8S_VERSION" ]; then k8s_version="$K8S_VERSION" fi -# TODO(SgtCoDFish): Using "KIND_IMAGE_FULL_*" here breaks podman, which doesn't support using both tags and digests -# when referring to an image. We should avoid using FULL where possible. - 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 ;; -1.26*) image=$KIND_IMAGE_FULL_K8S_126 ;; -1.27*) image=$KIND_IMAGE_FULL_K8S_127 ;; -1.28*) image=$KIND_IMAGE_FULL_K8S_128 ;; -1.29*) image=$KIND_IMAGE_FULL_K8S_129 ;; +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 ;; 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 736052853..f211527cd 100644 --- a/make/kind_images.sh +++ b/make/kind_images.sh @@ -46,15 +46,3 @@ KIND_IMAGE_SHA_K8S_128=sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a # docker.io/kindest/node:v1.29.0 KIND_IMAGE_SHA_K8S_129=sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 - -# note that these 'full' digests should be avoided since not all tools support them -# prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2 -KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb -KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab -KIND_IMAGE_FULL_K8S_125=docker.io/kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 -KIND_IMAGE_FULL_K8S_126=docker.io/kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb -KIND_IMAGE_FULL_K8S_127=docker.io/kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 -KIND_IMAGE_FULL_K8S_128=docker.io/kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 -KIND_IMAGE_FULL_K8S_129=docker.io/kindest/node:v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 -