Skip to content

Commit f1dfe6f

Browse files
sbueringersbueringer
committed
Bump kind to v0.31.0
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent e847e89 commit f1dfe6f

File tree

10 files changed

+59
-32
lines changed

10 files changed

+59
-32
lines changed

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
clusterctl_cmd = "./bin/clusterctl"
44
kubectl_cmd = "kubectl"
5-
kubernetes_version = "v1.34.0"
5+
kubernetes_version = "v1.35.0"
66

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

‎docs/book/src/developer/core/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 (on MacOS e.g. via [Lima](https://github.com/lima-vm/lima))
11-
2. [kind](https://kind.sigs.k8s.io): v0.30.0 or newer
11+
2. [kind](https://kind.sigs.k8s.io): v0.31.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`
@@ -427,7 +427,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
427427
```yaml
428428
kustomize_substitutions:
429429
NAMESPACE: "default"
430-
KUBERNETES_VERSION: "v1.34.0"
430+
KUBERNETES_VERSION: "v1.35.0"
431431
CONTROL_PLANE_MACHINE_COUNT: "1"
432432
WORKER_MACHINE_COUNT: "3"
433433
# 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: 18 additions & 18 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.30.0
59+
**Minimum [kind] supported version**: v0.31.0
6060

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

@@ -1554,7 +1554,7 @@ The Docker provider is not designed for production use and is intended for devel
15541554
15551555
```bash
15561556
clusterctl generate cluster capi-quickstart --flavor development \
1557-
--kubernetes-version v1.34.0 \
1557+
--kubernetes-version v1.35.0 \
15581558
--control-plane-machine-count=3 \
15591559
--worker-machine-count=3 \
15601560
> capi-quickstart.yaml
@@ -1600,7 +1600,7 @@ clusterctl generate cluster capi-quickstart \
16001600
```bash
16011601
clusterctl generate cluster capi-quickstart \
16021602
--infrastructure azure \
1603-
--kubernetes-version v1.34.0 \
1603+
--kubernetes-version v1.35.0 \
16041604
--control-plane-machine-count=3 \
16051605
--worker-machine-count=3 \
16061606
> capi-quickstart.yaml
@@ -1615,7 +1615,7 @@ yq -i "with(. | select(.kind == \"AzureClusterIdentity\"); .spec.type |= \"Servi
16151615
16161616
```bash
16171617
clusterctl generate cluster capi-quickstart \
1618-
--kubernetes-version v1.34.0 \
1618+
--kubernetes-version v1.35.0 \
16191619
--control-plane-machine-count=3 \
16201620
--worker-machine-count=3 \
16211621
> capi-quickstart.yaml
@@ -1669,7 +1669,7 @@ and see an output similar to this:
16691669
16701670
```bash
16711671
NAME PHASE AGE VERSION
1672-
capi-quickstart Provisioned 8s v1.34.0
1672+
capi-quickstart Provisioned 8s v1.35.0
16731673
```
16741674
16751675
To verify the first control plane is up:
@@ -1682,7 +1682,7 @@ You should see an output is similar to this:
16821682
16831683
```bash
16841684
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1685-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.34.0
1685+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.35.0
16861686
```
16871687
16881688
<aside class="note warning">
@@ -1836,12 +1836,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
18361836
```
18371837
```bash
18381838
NAME STATUS ROLES AGE VERSION
1839-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.34.0
1840-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.34.0
1841-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.34.0
1842-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.34.0
1843-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.34.0
1844-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.34.0
1839+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.35.0
1840+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.35.0
1841+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.35.0
1842+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.35.0
1843+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.35.0
1844+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.35.0
18451845
```
18461846
18471847
{{#/tab }}
@@ -1925,12 +1925,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
19251925
```
19261926
```bash
19271927
NAME STATUS ROLES AGE VERSION
1928-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.34.0
1929-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.34.0
1930-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.34.0
1931-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.34.0
1932-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.34.0
1933-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.34.0
1928+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.35.0
1929+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.35.0
1930+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.35.0
1931+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.35.0
1932+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.35.0
1933+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.35.0
19341934
```
19351935
19361936
{{#/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.30.0
33+
MINIMUM_KIND_VERSION=v0.31.0
3434

3535

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

‎test/e2e/config/docker.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ variables:
373373
# This avoids building node images in the default case which improves the test duration significantly.
374374
KUBERNETES_VERSION_MANAGEMENT: "v1.35.0"
375375
KUBERNETES_VERSION: "v1.35.0"
376-
KUBERNETES_VERSION_CHAINED_UPGRADE_FROM: "v1.31.0" # Should always be KUBERNETES_VERSION_UPGRADE_TO - 4 minor
377-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.34.0"
376+
KUBERNETES_VERSION_CHAINED_UPGRADE_FROM: "v1.31.14" # Should always be KUBERNETES_VERSION_UPGRADE_TO - 4 minor
377+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.34.3"
378378
KUBERNETES_VERSION_UPGRADE_TO: "v1.35.0"
379379
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.36"
380380
ETCD_VERSION_UPGRADE_TO: "3.6.6-0"

‎test/framework/bootstrap/kind_provider.go‎

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

3838
// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
39-
DefaultNodeImageVersion = "v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a"
39+
DefaultNodeImageVersion = "v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f"
4040
)
4141

4242
// KindClusterOption is a NewKindClusterProvider option.

‎test/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3636
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
3737
sigs.k8s.io/controller-runtime v0.22.4
38-
sigs.k8s.io/kind v0.30.0
38+
sigs.k8s.io/kind v0.31.0
3939
sigs.k8s.io/randfill v1.0.0
4040
sigs.k8s.io/yaml v1.6.0
4141
)

‎test/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327U
501501
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
502502
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
503503
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
504-
sigs.k8s.io/kind v0.30.0 h1:2Xi1KFEfSMm0XDcvKnUt15ZfgRPCT0OnCBbpgh8DztY=
505-
sigs.k8s.io/kind v0.30.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
504+
sigs.k8s.io/kind v0.31.0 h1:UcT4nzm+YM7YEbqiAKECk+b6dsvc/HRZZu9U0FolL1g=
505+
sigs.k8s.io/kind v0.31.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
506506
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
507507
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
508508
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=

‎test/infrastructure/kind/mapper.go‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,32 @@ var preBuiltMappings = []Mapping{
8181

8282
// TODO: Add pre-built images for newer Kind versions on top
8383
// Pre-built images for Kind v0.30.
84+
{
85+
KubernetesVersion: semver.MustParse("1.35.0"),
86+
Mode: Mode0_20,
87+
Image: "kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f",
88+
},
89+
{
90+
KubernetesVersion: semver.MustParse("1.34.3"),
91+
Mode: Mode0_20,
92+
Image: "kindest/node:v1.34.3@sha256:08497ee19eace7b4b5348db5c6a1591d7752b164530a36f855cb0f2bdcbadd48",
93+
},
94+
{
95+
KubernetesVersion: semver.MustParse("1.33.7"),
96+
Mode: Mode0_20,
97+
Image: "kindest/node:v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040",
98+
},
99+
{
100+
KubernetesVersion: semver.MustParse("1.32.11"),
101+
Mode: Mode0_20,
102+
Image: "kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8",
103+
},
104+
{
105+
KubernetesVersion: semver.MustParse("1.31.14"),
106+
Mode: Mode0_20,
107+
Image: "kindest/node:v1.31.14@sha256:6f86cf509dbb42767b6e79debc3f2c32e4ee01386f0489b3b2be24b0a55aac2b",
108+
},
109+
// Pre-built images for Kind v0.30.
84110
{
85111
KubernetesVersion: semver.MustParse("1.34.0"),
86112
Mode: Mode0_20,

‎test/infrastructure/kind/mapper_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,10 @@ func TestGetKubernetesVersion(t *testing.T) {
144144
"v1.28.0", "v1.28.6", "v1.28.7", "v1.28.9", "v1.28.12", "v1.28.13", "v1.28.15",
145145
"v1.29.0", "v1.29.1", "v1.29.2", "v1.29.4", "v1.29.7", "v1.29.8", "v1.29.10", "v1.29.12", "v1.29.14",
146146
"v1.30.0", "v1.30.3", "v1.30.4", "v1.30.6", "v1.30.8", "v1.30.10", "v1.30.13",
147-
"v1.31.0", "v1.31.2", "v1.31.4", "v1.31.6", "v1.31.9", "v1.31.12",
148-
"v1.32.0", "v1.32.2", "v1.32.5", "v1.32.8",
149-
"v1.33.0", "v1.33.1", "v1.33.4",
150-
"v1.34.0",
147+
"v1.31.0", "v1.31.2", "v1.31.4", "v1.31.6", "v1.31.9", "v1.31.12", "v1.31.14",
148+
"v1.32.0", "v1.32.2", "v1.32.5", "v1.32.8", "v1.32.11",
149+
"v1.33.0", "v1.33.1", "v1.33.4", "v1.33.7",
150+
"v1.34.0", "v1.34.3",
151+
"v1.35.0",
151152
}))
152153
}

0 commit comments

Comments
 (0)