From 99521fc3f35a992a9396558c569ba98bd77cf8ad Mon Sep 17 00:00:00 2001 From: Stephen Cahill Date: Sat, 3 Feb 2024 21:44:36 -0500 Subject: [PATCH] Bump kind to v0.22.0 --- Tiltfile | 2 +- .../providers/migrations/v1.6-to-v1.7.md | 1 + docs/book/src/developer/tilt.md | 4 +- docs/book/src/user/quick-start.md | 22 ++++---- hack/ensure-kind.sh | 2 +- test/e2e/clusterctl_upgrade_test.go | 8 +-- test/e2e/config/docker.yaml | 6 +- test/framework/bootstrap/kind_provider.go | 2 +- test/go.mod | 2 +- test/go.sum | 4 +- .../docker/examples/machine-pool.yaml | 4 +- .../docker/examples/simple-cluster-ipv6.yaml | 4 +- .../examples/simple-cluster-without-kcp.yaml | 4 +- .../docker/examples/simple-cluster.yaml | 4 +- test/infrastructure/kind/mapper.go | 56 +++++++++++++++++++ test/infrastructure/kind/mapper_test.go | 10 +++- 16 files changed, 100 insertions(+), 35 deletions(-) diff --git a/Tiltfile b/Tiltfile index fa5b97684163..82bea649f86d 100644 --- a/Tiltfile +++ b/Tiltfile @@ -3,7 +3,7 @@ envsubst_cmd = "./hack/tools/bin/envsubst" clusterctl_cmd = "./bin/clusterctl" kubectl_cmd = "kubectl" -kubernetes_version = "v1.29.0" +kubernetes_version = "v1.29.2" load("ext://uibutton", "cmd_button", "location", "text_input") diff --git a/docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md b/docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md index e7999a0869a0..d361011c8bfd 100644 --- a/docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md +++ b/docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md @@ -10,6 +10,7 @@ maintainers of providers and consumers of our Go API. ## Dependencies **Note**: Only the most relevant dependencies are listed, `k8s.io/` and `ginkgo`/`gomega` dependencies in Cluster API are kept in sync with the versions used by `sigs.k8s.io/controller-runtime`. +- sigs.k8s.io/kind: v0.20.x => v0.22.x ## Changes by Kind diff --git a/docs/book/src/developer/tilt.md b/docs/book/src/developer/tilt.md index 037a518721ac..3dec91b63380 100644 --- a/docs/book/src/developer/tilt.md +++ b/docs/book/src/developer/tilt.md @@ -8,7 +8,7 @@ workflow that offers easy deployments and rapid iterative builds. ## Prerequisites 1. [Docker](https://docs.docker.com/install/): v19.03 or newer -2. [kind](https://kind.sigs.k8s.io): v0.20.0 or newer +2. [kind](https://kind.sigs.k8s.io): v0.22.0 or newer 3. [Tilt](https://docs.tilt.dev/install.html): v0.30.8 or newer 4. [kustomize](https://github.com/kubernetes-sigs/kustomize): provided via `make kustomize` 5. [envsubst](https://github.com/drone/envsubst): provided via `make envsubst` @@ -337,7 +337,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio ```yaml kustomize_substitutions: NAMESPACE: "default" - KUBERNETES_VERSION: "v1.29.0" + KUBERNETES_VERSION: "v1.29.2" 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 5d4828fe05f1..34f6e5d1eab3 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -56,7 +56,7 @@ a target [management cluster] on the selected [infrastructure provider]. [kind] is not designed for production use. - **Minimum [kind] supported version**: v0.20.0 + **Minimum [kind] supported version**: v0.22.0 **Help with common issues can be found in the [Troubleshooting Guide](./troubleshooting.md).** @@ -1305,7 +1305,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.29.0 \ + --kubernetes-version v1.29.2 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1348,7 +1348,7 @@ clusterctl generate cluster capi-quickstart \ ```bash clusterctl generate cluster capi-quickstart \ - --kubernetes-version v1.29.0 \ + --kubernetes-version v1.29.2 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1402,7 +1402,7 @@ and see an output similar to this: ```bash NAME PHASE AGE VERSION -capi-quickstart Provisioned 8s v1.29.0 +capi-quickstart Provisioned 8s v1.29.2 ``` To verify the first control plane is up: @@ -1415,7 +1415,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.29.0 +capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.29.2 ```