Skip to content

Commit 21ccc77

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11081 from chrischdi/pr-kind-0-24
🌱 Bump kind to v0.24.0
2 parents 6dfeb71 + fc61970 commit 21ccc77

File tree

10 files changed

+86
-29
lines changed

10 files changed

+86
-29
lines changed

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
envsubst_cmd = "./hack/tools/bin/envsubst"
44
clusterctl_cmd = "./bin/clusterctl"
55
kubectl_cmd = "kubectl"
6-
kubernetes_version = "v1.30.0"
6+
kubernetes_version = "v1.31.0"
77

88
load("ext://uibutton", "cmd_button", "location", "text_input")
99

‎docs/book/src/developer/tilt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ workflow that offers easy deployments and rapid iterative builds.
88
## Prerequisites
99

1010
1. [Docker](https://docs.docker.com/install/): v19.03 or newer
11-
2. [kind](https://kind.sigs.k8s.io): v0.23.0 or newer
11+
2. [kind](https://kind.sigs.k8s.io): v0.24.0 or newer
1212
3. [Tilt](https://docs.tilt.dev/install.html): v0.30.8 or newer
1313
4. [kustomize](https://github.com/kubernetes-sigs/kustomize): provided via `make kustomize`
1414
5. [envsubst](https://github.com/drone/envsubst): provided via `make envsubst`
@@ -335,7 +335,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
335335
```yaml
336336
kustomize_substitutions:
337337
NAMESPACE: "default"
338-
KUBERNETES_VERSION: "v1.30.0"
338+
KUBERNETES_VERSION: "v1.31.0"
339339
CONTROL_PLANE_MACHINE_COUNT: "1"
340340
WORKER_MACHINE_COUNT: "3"
341341
# Note: kustomize substitutions expects the values to be strings. This can be achieved by wrapping the values in quotation marks.

‎docs/book/src/user/quick-start.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ a target [management cluster] on the selected [infrastructure provider].
5656

5757
[kind] is not designed for production use.
5858

59-
**Minimum [kind] supported version**: v0.23.0
59+
**Minimum [kind] supported version**: v0.24.0
6060

6161
**Help with common issues can be found in the [Troubleshooting Guide](./troubleshooting.md).**
6262

@@ -1359,7 +1359,7 @@ The Docker provider is not designed for production use and is intended for devel
13591359
13601360
```bash
13611361
clusterctl generate cluster capi-quickstart --flavor development \
1362-
--kubernetes-version v1.30.0 \
1362+
--kubernetes-version v1.31.0 \
13631363
--control-plane-machine-count=3 \
13641364
--worker-machine-count=3 \
13651365
> capi-quickstart.yaml
@@ -1403,7 +1403,7 @@ clusterctl generate cluster capi-quickstart \
14031403
```bash
14041404
clusterctl generate cluster capi-quickstart \
14051405
--infrastructure azure \
1406-
--kubernetes-version v1.30.0 \
1406+
--kubernetes-version v1.31.0 \
14071407
--control-plane-machine-count=3 \
14081408
--worker-machine-count=3 \
14091409
> capi-quickstart.yaml
@@ -1418,7 +1418,7 @@ yq -i "with(. | select(.kind == \"AzureClusterIdentity\"); .spec.type |= \"Servi
14181418
14191419
```bash
14201420
clusterctl generate cluster capi-quickstart \
1421-
--kubernetes-version v1.30.0 \
1421+
--kubernetes-version v1.31.0 \
14221422
--control-plane-machine-count=3 \
14231423
--worker-machine-count=3 \
14241424
> capi-quickstart.yaml
@@ -1472,7 +1472,7 @@ and see an output similar to this:
14721472
14731473
```bash
14741474
NAME PHASE AGE VERSION
1475-
capi-quickstart Provisioned 8s v1.30.0
1475+
capi-quickstart Provisioned 8s v1.31.0
14761476
```
14771477
14781478
To verify the first control plane is up:
@@ -1485,7 +1485,7 @@ You should see an output is similar to this:
14851485
14861486
```bash
14871487
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1488-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.30.0
1488+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.31.0
14891489
```
14901490
14911491
<aside class="note warning">
@@ -1740,12 +1740,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
17401740
```
17411741
```bash
17421742
NAME STATUS ROLES AGE VERSION
1743-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.30.0
1744-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.30.0
1745-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.30.0
1746-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.30.0
1747-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.30.0
1748-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.30.0
1743+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.31.0
1744+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.31.0
1745+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.31.0
1746+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.31.0
1747+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.31.0
1748+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.31.0
17491749
```
17501750
17511751
{{#/tab }}

‎hack/ensure-kind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ goarch="$(go env GOARCH)"
3030
goos="$(go env GOOS)"
3131

3232
# Note: When updating the MINIMUM_KIND_VERSION new shas MUST be added in `preBuiltMappings` at `test/infrastructure/kind/mapper.go`
33-
MINIMUM_KIND_VERSION=v0.23.0
33+
MINIMUM_KIND_VERSION=v0.24.0
3434

3535

3636
# Ensure the kind tool exists and is a viable version, or installs it

‎scripts/ci-e2e-lib.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,13 @@ kind::buildNodeImage() {
192192

193193
# build the node image
194194
version="${version//+/_}"
195-
echo "+ Building kindest/node:$version"
196-
kind build node-image --image "kindest/node:$version"
195+
if [[ "${version}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] || [[ "${version}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then
196+
echo "+ Building kindest/node:$version using pre-built binaries"
197+
kind build node-image --image "kindest/node:$version" "$version"
198+
else
199+
echo "+ Building kindest/node:$version from source"
200+
kind build node-image --image "kindest/node:$version"
201+
fi
197202

198203
# move back to Cluster API
199204
cd "$REPO_ROOT" || exit

‎test/e2e/config/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ variables:
394394
# This avoids building node images in the default case which improves the test duration significantly.
395395
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
396396
KUBERNETES_VERSION: "v1.31.0"
397-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.2"
397+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.4"
398398
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0"
399399
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.32"
400400
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"

‎test/framework/bootstrap/kind_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
DefaultNodeImageRepository = "kindest/node"
3838

3939
// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
40-
DefaultNodeImageVersion = "v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
40+
DefaultNodeImageVersion = "v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865"
4141
)
4242

4343
// KindClusterOption is a NewKindClusterProvider option.

‎test/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ require (
3434
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3535
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
3636
sigs.k8s.io/controller-runtime v0.19.0
37-
sigs.k8s.io/kind v0.23.0
37+
sigs.k8s.io/kind v0.24.0
3838
sigs.k8s.io/yaml v1.4.0
3939
)
4040

4141
require (
4242
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
43-
github.com/BurntSushi/toml v1.0.0 // indirect
43+
github.com/BurntSushi/toml v1.4.0 // indirect
4444
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4545
github.com/Masterminds/goutils v1.1.1 // indirect
4646
github.com/Masterminds/semver/v3 v3.2.0 // indirect
@@ -49,7 +49,7 @@ require (
4949
github.com/NYTimes/gziphandler v1.1.1 // indirect
5050
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5151
github.com/adrg/xdg v0.5.0 // indirect
52-
github.com/alessio/shellescape v1.4.1 // indirect
52+
github.com/alessio/shellescape v1.4.2 // indirect
5353
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5454
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5555
github.com/beorn7/perks v1.0.1 // indirect

‎test/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
22
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
33
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
44
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
5-
github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
6-
github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
5+
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
6+
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
77
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
88
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
99
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -21,8 +21,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0g
2121
github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
2222
github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
2323
github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c=
24-
github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
25-
github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
24+
github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
25+
github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
2626
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
2727
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
2828
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -571,8 +571,8 @@ sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC
571571
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
572572
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
573573
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
574-
sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg=
575-
sigs.k8s.io/kind v0.23.0/go.mod h1:ZQ1iZuJLh3T+O8fzhdi3VWcFTzsdXtNv2ppsHc8JQ7s=
574+
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg=
575+
sigs.k8s.io/kind v0.24.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
576576
sigs.k8s.io/kustomize/api v0.17.3 h1:6GCuHSsxq7fN5yhF2XrC+AAr8gxQwhexgHflOAD/JJU=
577577
sigs.k8s.io/kustomize/api v0.17.3/go.mod h1:TuDH4mdx7jTfK61SQ/j1QZM/QWR+5rmEiNjvYlhzFhc=
578578
sigs.k8s.io/kustomize/kyaml v0.17.2 h1:+AzvoJUY0kq4QAhH/ydPHHMRLijtUKiyVyh7fOSshr0=

‎test/infrastructure/kind/mapper.go

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,58 @@ type Mapping struct {
7979
var preBuiltMappings = []Mapping{
8080

8181
// TODO: Add pre-built images for newer Kind versions on top
82+
// Pre-built images for Kind v1.24.
83+
{
84+
KubernetesVersion: semver.MustParse("1.31.0"),
85+
Mode: Mode0_20,
86+
Image: "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865",
87+
},
88+
{
89+
KubernetesVersion: semver.MustParse("1.30.4"),
90+
Mode: Mode0_20,
91+
Image: "kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114",
92+
},
93+
{
94+
KubernetesVersion: semver.MustParse("1.30.3"),
95+
Mode: Mode0_20,
96+
Image: "kindest/node:v1.30.3@sha256:bf91e1ef2f7d92bb7734b2b896b3dddea98f0496b34d96e37dd5d7df331b7e56",
97+
},
98+
{
99+
KubernetesVersion: semver.MustParse("1.29.8"),
100+
Mode: Mode0_20,
101+
Image: "kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa",
102+
},
103+
{
104+
KubernetesVersion: semver.MustParse("1.29.7"),
105+
Mode: Mode0_20,
106+
Image: "kindest/node:v1.29.7@sha256:f70ab5d833fca132a100c1f95490be25d76188b053f49a3c0047ff8812360baf",
107+
},
108+
{
109+
KubernetesVersion: semver.MustParse("1.28.13"),
110+
Mode: Mode0_20,
111+
Image: "kindest/node:v1.28.13@sha256:45d319897776e11167e4698f6b14938eb4d52eb381d9e3d7a9086c16c69a8110",
112+
},
113+
{
114+
KubernetesVersion: semver.MustParse("1.28.12"),
115+
Mode: Mode0_20,
116+
Image: "kindest/node:v1.28.12@sha256:fa0e48b1e83bb8688a5724aa7eebffbd6337abd7909ad089a2700bf08c30c6ea",
117+
},
118+
{
119+
KubernetesVersion: semver.MustParse("1.27.16"),
120+
Mode: Mode0_20,
121+
Image: "kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe",
122+
},
123+
{
124+
KubernetesVersion: semver.MustParse("1.26.15"),
125+
Mode: Mode0_20,
126+
Image: "kindest/node:v1.26.15@sha256:1cc15d7b1edd2126ef051e359bf864f37bbcf1568e61be4d2ed1df7a3e87b354",
127+
},
128+
{
129+
KubernetesVersion: semver.MustParse("1.25.16"),
130+
Mode: Mode0_20,
131+
Image: "kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025",
132+
},
133+
82134
// Pre-built images for Kind v1.23.
83135
{
84136
KubernetesVersion: semver.MustParse("1.30.0"),

0 commit comments

Comments
 (0)