diff --git a/devel/cluster/kind_cluster_node_versions.sh b/devel/cluster/kind_cluster_node_versions.sh index 18262566d..476a39c38 100644 --- a/devel/cluster/kind_cluster_node_versions.sh +++ b/devel/cluster/kind_cluster_node_versions.sh @@ -14,39 +14,29 @@ # generated by ./hack/latest-kind-images.sh -KIND_IMAGE_K8S_118=docker.io/kindest/node@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed -KIND_IMAGE_K8S_119=docker.io/kindest/node@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 -KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 -KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e -KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e -KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 - -# docker.io/kindest/node:v1.18.20 -KIND_IMAGE_SHA_K8S_118=sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed - -# docker.io/kindest/node:v1.19.16 -KIND_IMAGE_SHA_K8S_119=sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 +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 # docker.io/kindest/node:v1.20.15 -KIND_IMAGE_SHA_K8S_120=sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 +KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 # docker.io/kindest/node:v1.21.12 -KIND_IMAGE_SHA_K8S_121=sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e +KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 # docker.io/kindest/node:v1.22.9 -KIND_IMAGE_SHA_K8S_122=sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e +KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 # docker.io/kindest/node:v1.23.6 -KIND_IMAGE_SHA_K8S_123=sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 +KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_118=docker.io/kindest/node:v1.18.20@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed -KIND_IMAGE_FULL_K8S_119=docker.io/kindest/node:v1.19.16@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 -KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 -KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e -KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e -KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 +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 # 1.24 is a special case for now since there's no official upstream image # eu.gcr.io/jetstack-build-infra-images/kind:v1.24.0 diff --git a/hack/latest-kind-images.sh b/hack/latest-kind-images.sh index af97ad138..8bf0e4c45 100755 --- a/hack/latest-kind-images.sh +++ b/hack/latest-kind-images.sh @@ -44,15 +44,11 @@ $CRANE ls $KIND_IMAGE_REPO > $TAGS # v1.20.7 # ... -LATEST_118_TAG=$(latest_kind_tag "1\\.18") -LATEST_119_TAG=$(latest_kind_tag "1\\.19") LATEST_120_TAG=$(latest_kind_tag "1\\.20") 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_118_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_118_TAG) -LATEST_119_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_119_TAG) LATEST_120_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_120_TAG) LATEST_121_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_121_TAG) LATEST_122_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_122_TAG) @@ -81,19 +77,11 @@ cat << EOF | tee ./devel/cluster/kind_cluster_node_versions.sh > ./make/kind_ima # generated by $0 -KIND_IMAGE_K8S_118=$KIND_IMAGE_REPO@$LATEST_118_DIGEST -KIND_IMAGE_K8S_119=$KIND_IMAGE_REPO@$LATEST_119_DIGEST KIND_IMAGE_K8S_120=$KIND_IMAGE_REPO@$LATEST_120_DIGEST 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_REPO:$LATEST_118_TAG -KIND_IMAGE_SHA_K8S_118=$LATEST_118_DIGEST - -# $KIND_IMAGE_REPO:$LATEST_119_TAG -KIND_IMAGE_SHA_K8S_119=$LATEST_119_DIGEST - # $KIND_IMAGE_REPO:$LATEST_120_TAG KIND_IMAGE_SHA_K8S_120=$LATEST_120_DIGEST @@ -108,8 +96,6 @@ KIND_IMAGE_SHA_K8S_123=$LATEST_123_DIGEST # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_118=$KIND_IMAGE_REPO:$LATEST_118_TAG@$LATEST_118_DIGEST -KIND_IMAGE_FULL_K8S_119=$KIND_IMAGE_REPO:$LATEST_119_TAG@$LATEST_119_DIGEST KIND_IMAGE_FULL_K8S_120=$KIND_IMAGE_REPO:$LATEST_120_TAG@$LATEST_120_DIGEST 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 diff --git a/make/kind_images.sh b/make/kind_images.sh index 18262566d..476a39c38 100644 --- a/make/kind_images.sh +++ b/make/kind_images.sh @@ -14,39 +14,29 @@ # generated by ./hack/latest-kind-images.sh -KIND_IMAGE_K8S_118=docker.io/kindest/node@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed -KIND_IMAGE_K8S_119=docker.io/kindest/node@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 -KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 -KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e -KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e -KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 - -# docker.io/kindest/node:v1.18.20 -KIND_IMAGE_SHA_K8S_118=sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed - -# docker.io/kindest/node:v1.19.16 -KIND_IMAGE_SHA_K8S_119=sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 +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 # docker.io/kindest/node:v1.20.15 -KIND_IMAGE_SHA_K8S_120=sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 +KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 # docker.io/kindest/node:v1.21.12 -KIND_IMAGE_SHA_K8S_121=sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e +KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207 # docker.io/kindest/node:v1.22.9 -KIND_IMAGE_SHA_K8S_122=sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e +KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105 # docker.io/kindest/node:v1.23.6 -KIND_IMAGE_SHA_K8S_123=sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 +KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae # note that these 'full' digests should be avoided since not all tools support them # prefer KIND_IMAGE_K8S_*** instead -KIND_IMAGE_FULL_K8S_118=docker.io/kindest/node:v1.18.20@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed -KIND_IMAGE_FULL_K8S_119=docker.io/kindest/node:v1.19.16@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 -KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 -KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e -KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e -KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 +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 # 1.24 is a special case for now since there's no official upstream image # eu.gcr.io/jetstack-build-infra-images/kind:v1.24.0