From 50585b1396d8ea37843b61effa63b6c58eb33ae8 Mon Sep 17 00:00:00 2001 From: Christian Schlotter <christian.schlotter@broadcom.com> Date: Fri, 13 Dec 2024 13:44:44 +0100 Subject: [PATCH] Bump default kind image to v1.32.0 --- docs/book/src/developer/core/tilt.md | 2 +- docs/book/src/user/quick-start.md | 22 +++++++++++----------- test/framework/bootstrap/kind_provider.go | 2 +- test/infrastructure/kind/mapper.go | 5 +++++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/docs/book/src/developer/core/tilt.md b/docs/book/src/developer/core/tilt.md index 7c95eb278571..8e693e6a6d27 100644 --- a/docs/book/src/developer/core/tilt.md +++ b/docs/book/src/developer/core/tilt.md @@ -335,7 +335,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio ```yaml kustomize_substitutions: NAMESPACE: "default" - KUBERNETES_VERSION: "v1.31.2" + KUBERNETES_VERSION: "v1.32.0" CONTROL_PLANE_MACHINE_COUNT: "1" WORKER_MACHINE_COUNT: "3" # Note: kustomize substitutions expects the values to be strings. This can be achieved by wrapping the values in quotation marks. diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md index 45ba31aae8fa..50735e85e028 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -1387,7 +1387,7 @@ The Docker provider is not designed for production use and is intended for devel ```bash clusterctl generate cluster capi-quickstart --flavor development \ - --kubernetes-version v1.31.2 \ + --kubernetes-version v1.32.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1431,7 +1431,7 @@ clusterctl generate cluster capi-quickstart \ ```bash clusterctl generate cluster capi-quickstart \ --infrastructure azure \ - --kubernetes-version v1.31.2 \ + --kubernetes-version v1.32.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1446,7 +1446,7 @@ yq -i "with(. | select(.kind == \"AzureClusterIdentity\"); .spec.type |= \"Servi ```bash clusterctl generate cluster capi-quickstart \ - --kubernetes-version v1.31.2 \ + --kubernetes-version v1.32.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1500,7 +1500,7 @@ and see an output similar to this: ```bash NAME PHASE AGE VERSION -capi-quickstart Provisioned 8s v1.31.2 +capi-quickstart Provisioned 8s v1.32.0 ``` To verify the first control plane is up: @@ -1513,7 +1513,7 @@ You should see an output is similar to this: ```bash NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION -capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.31.2 +capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.32.0 ``` <aside class="note warning"> @@ -1768,12 +1768,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes ``` ```bash NAME STATUS ROLES AGE VERSION -capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.31.2 -capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.31.2 -capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.31.2 -capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.31.2 -capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.31.2 -capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.31.2 +capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.32.0 +capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.32.0 +capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.32.0 +capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.32.0 +capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.32.0 +capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.32.0 ``` {{#/tab }} diff --git a/test/framework/bootstrap/kind_provider.go b/test/framework/bootstrap/kind_provider.go index 8049fafb3e3a..4d1528f183fc 100644 --- a/test/framework/bootstrap/kind_provider.go +++ b/test/framework/bootstrap/kind_provider.go @@ -37,7 +37,7 @@ const ( DefaultNodeImageRepository = "kindest/node" // DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster. - DefaultNodeImageVersion = "v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e" + DefaultNodeImageVersion = "v1.32.0@sha256:2458b423d635d7b01637cac2d6de7e1c1dca1148a2ba2e90975e214ca849e7cb" ) // KindClusterOption is a NewKindClusterProvider option. diff --git a/test/infrastructure/kind/mapper.go b/test/infrastructure/kind/mapper.go index 5c763929b6dc..a3903a72993c 100644 --- a/test/infrastructure/kind/mapper.go +++ b/test/infrastructure/kind/mapper.go @@ -80,6 +80,11 @@ var preBuiltMappings = []Mapping{ // TODO: Add pre-built images for newer Kind versions on top // Pre-built images for Kind v1.25. + { + KubernetesVersion: semver.MustParse("1.32.0"), + Mode: Mode0_20, + Image: "kindest/node:v1.32.0@sha256:2458b423d635d7b01637cac2d6de7e1c1dca1148a2ba2e90975e214ca849e7cb", + }, { KubernetesVersion: semver.MustParse("1.31.2"), Mode: Mode0_20,