Skip to content

Commit 519e2d1

Browse files
inteoninteon
committed
add kind 1.25
Signed-off-by: Tim Ramlot <[email protected]>
1 parent 231a046 commit 519e2d1

File tree

5 files changed

+61
-41
lines changed

5 files changed

+61
-41
lines changed

‎devel/cluster/create-kind.sh

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ elif [[ "$K8S_VERSION" =~ 1\.23 ]]; then
4848
KIND_IMAGE=$KIND_IMAGE_K8S_123
4949
elif [[ "$K8S_VERSION" =~ 1\.24 ]]; then
5050
KIND_IMAGE=$KIND_IMAGE_K8S_124
51+
elif [[ "$K8S_VERSION" =~ 1\.25 ]]; then
52+
KIND_IMAGE=$KIND_IMAGE_K8S_125
5153
else
5254
echo "Unrecognised/unsupported Kubernetes version '${K8S_VERSION}'! Aborting..."
5355
exit 1

‎devel/cluster/kind_cluster_node_versions.sh

+25-20
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,38 @@
1313
# limitations under the License.
1414

1515
# generated by ./hack/latest-kind-images.sh
16-
# 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
1716

18-
KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
19-
KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
20-
KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
21-
KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
22-
KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
17+
KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
18+
KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
19+
KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
20+
KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
21+
KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
22+
KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
2323

2424
# docker.io/kindest/node:v1.20.15
25-
KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
25+
KIND_IMAGE_SHA_K8S_120=sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
2626

27-
# docker.io/kindest/node:v1.21.12
28-
KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
27+
# docker.io/kindest/node:v1.21.14
28+
KIND_IMAGE_SHA_K8S_121=sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
2929

30-
# docker.io/kindest/node:v1.22.9
31-
KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
30+
# docker.io/kindest/node:v1.22.15
31+
KIND_IMAGE_SHA_K8S_122=sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
3232

33-
# docker.io/kindest/node:v1.23.6
34-
KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
33+
# docker.io/kindest/node:v1.23.12
34+
KIND_IMAGE_SHA_K8S_123=sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
3535

36-
# docker.io/kindest/node:v1.24.0
37-
KIND_IMAGE_SHA_K8S_124=sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
36+
# docker.io/kindest/node:v1.24.6
37+
KIND_IMAGE_SHA_K8S_124=sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
38+
39+
# docker.io/kindest/node:v1.25.2
40+
KIND_IMAGE_SHA_K8S_125=sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
3841

3942
# note that these 'full' digests should be avoided since not all tools support them
4043
# prefer KIND_IMAGE_K8S_*** instead
41-
KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
42-
KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
43-
KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
44-
KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
45-
KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
44+
KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
45+
KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.14@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
46+
KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
47+
KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
48+
KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
49+
KIND_IMAGE_FULL_K8S_125=docker.io/kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
50+

‎hack/latest-kind-images.sh

+7
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ LATEST_121_TAG=$(latest_kind_tag "1\\.21")
5353
LATEST_122_TAG=$(latest_kind_tag "1\\.22")
5454
LATEST_123_TAG=$(latest_kind_tag "1\\.23")
5555
LATEST_124_TAG=$(latest_kind_tag "1\\.24")
56+
LATEST_125_TAG=$(latest_kind_tag "1\\.25")
5657

5758

5859
LATEST_120_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_120_TAG)
5960
LATEST_121_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_121_TAG)
6061
LATEST_122_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_122_TAG)
6162
LATEST_123_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_123_TAG)
6263
LATEST_124_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_124_TAG)
64+
LATEST_125_DIGEST=$(crane digest $KIND_IMAGE_REPO:$LATEST_125_TAG)
6365

6466
cat << EOF | tee ./devel/cluster/kind_cluster_node_versions.sh > ./make/kind_images.sh
6567
# Copyright 2022 The cert-manager Authors.
@@ -83,6 +85,7 @@ KIND_IMAGE_K8S_121=$KIND_IMAGE_REPO@$LATEST_121_DIGEST
8385
KIND_IMAGE_K8S_122=$KIND_IMAGE_REPO@$LATEST_122_DIGEST
8486
KIND_IMAGE_K8S_123=$KIND_IMAGE_REPO@$LATEST_123_DIGEST
8587
KIND_IMAGE_K8S_124=$KIND_IMAGE_REPO@$LATEST_124_DIGEST
88+
KIND_IMAGE_K8S_125=$KIND_IMAGE_REPO@$LATEST_125_DIGEST
8689
8790
# $KIND_IMAGE_REPO:$LATEST_120_TAG
8891
KIND_IMAGE_SHA_K8S_120=$LATEST_120_DIGEST
@@ -99,13 +102,17 @@ KIND_IMAGE_SHA_K8S_123=$LATEST_123_DIGEST
99102
# $KIND_IMAGE_REPO:$LATEST_124_TAG
100103
KIND_IMAGE_SHA_K8S_124=$LATEST_124_DIGEST
101104
105+
# $KIND_IMAGE_REPO:$LATEST_125_TAG
106+
KIND_IMAGE_SHA_K8S_125=$LATEST_125_DIGEST
107+
102108
# note that these 'full' digests should be avoided since not all tools support them
103109
# prefer KIND_IMAGE_K8S_*** instead
104110
KIND_IMAGE_FULL_K8S_120=$KIND_IMAGE_REPO:$LATEST_120_TAG@$LATEST_120_DIGEST
105111
KIND_IMAGE_FULL_K8S_121=$KIND_IMAGE_REPO:$LATEST_121_TAG@$LATEST_121_DIGEST
106112
KIND_IMAGE_FULL_K8S_122=$KIND_IMAGE_REPO:$LATEST_122_TAG@$LATEST_122_DIGEST
107113
KIND_IMAGE_FULL_K8S_123=$KIND_IMAGE_REPO:$LATEST_123_TAG@$LATEST_123_DIGEST
108114
KIND_IMAGE_FULL_K8S_124=$KIND_IMAGE_REPO:$LATEST_124_TAG@$LATEST_124_DIGEST
115+
KIND_IMAGE_FULL_K8S_125=$KIND_IMAGE_REPO:$LATEST_125_TAG@$LATEST_125_DIGEST
109116
110117
EOF
111118

‎make/cluster.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set -e
2525
source ./make/kind_images.sh
2626

2727
mode=kind
28-
k8s_version=1.24
28+
k8s_version=1.25
2929
kind_cluster_name=kind
3030

3131
help() {
@@ -109,6 +109,7 @@ case "$k8s_version" in
109109
1.22*) image=$KIND_IMAGE_FULL_K8S_122 ;;
110110
1.23*) image=$KIND_IMAGE_FULL_K8S_123 ;;
111111
1.24*) image=$KIND_IMAGE_FULL_K8S_124 ;;
112+
1.25*) image=$KIND_IMAGE_FULL_K8S_125 ;;
112113
v*) printf "${red}${redcross}Error${end}: Kubernetes version must be given without the leading 'v'\n" >&2 && exit 1 ;;
113114
*) printf "${red}${redcross}Error${end}: unsupported Kubernetes version ${yel}${k8s_version}${end}\n" >&2 && exit 1 ;;
114115
esac

‎make/kind_images.sh

+25-20
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,38 @@
1313
# limitations under the License.
1414

1515
# generated by ./hack/latest-kind-images.sh
16-
# 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
1716

18-
KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
19-
KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
20-
KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
21-
KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
22-
KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
17+
KIND_IMAGE_K8S_120=docker.io/kindest/node@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
18+
KIND_IMAGE_K8S_121=docker.io/kindest/node@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
19+
KIND_IMAGE_K8S_122=docker.io/kindest/node@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
20+
KIND_IMAGE_K8S_123=docker.io/kindest/node@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
21+
KIND_IMAGE_K8S_124=docker.io/kindest/node@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
22+
KIND_IMAGE_K8S_125=docker.io/kindest/node@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
2323

2424
# docker.io/kindest/node:v1.20.15
25-
KIND_IMAGE_SHA_K8S_120=sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
25+
KIND_IMAGE_SHA_K8S_120=sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
2626

27-
# docker.io/kindest/node:v1.21.12
28-
KIND_IMAGE_SHA_K8S_121=sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
27+
# docker.io/kindest/node:v1.21.14
28+
KIND_IMAGE_SHA_K8S_121=sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
2929

30-
# docker.io/kindest/node:v1.22.9
31-
KIND_IMAGE_SHA_K8S_122=sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
30+
# docker.io/kindest/node:v1.22.15
31+
KIND_IMAGE_SHA_K8S_122=sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
3232

33-
# docker.io/kindest/node:v1.23.6
34-
KIND_IMAGE_SHA_K8S_123=sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
33+
# docker.io/kindest/node:v1.23.12
34+
KIND_IMAGE_SHA_K8S_123=sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
3535

36-
# docker.io/kindest/node:v1.24.0
37-
KIND_IMAGE_SHA_K8S_124=sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
36+
# docker.io/kindest/node:v1.24.6
37+
KIND_IMAGE_SHA_K8S_124=sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
38+
39+
# docker.io/kindest/node:v1.25.2
40+
KIND_IMAGE_SHA_K8S_125=sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
3841

3942
# note that these 'full' digests should be avoided since not all tools support them
4043
# prefer KIND_IMAGE_K8S_*** instead
41-
KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
42-
KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
43-
KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
44-
KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
45-
KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
44+
KIND_IMAGE_FULL_K8S_120=docker.io/kindest/node:v1.20.15@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
45+
KIND_IMAGE_FULL_K8S_121=docker.io/kindest/node:v1.21.14@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
46+
KIND_IMAGE_FULL_K8S_122=docker.io/kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586
47+
KIND_IMAGE_FULL_K8S_123=docker.io/kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
48+
KIND_IMAGE_FULL_K8S_124=docker.io/kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
49+
KIND_IMAGE_FULL_K8S_125=docker.io/kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
50+

0 commit comments

Comments
 (0)