From d23bb93214e25b8e3e7d03339449a256f7e46ac6 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 13 Dec 2023 12:06:14 +0100 Subject: [PATCH] v1.29: Prepare quickstart, capd and tests for the new release including kind bump --- Tiltfile | 2 +- docs/book/src/developer/tilt.md | 2 +- docs/book/src/reference/versions.md | 3 +++ docs/book/src/user/quick-start.md | 20 +++++++++---------- test/e2e/clusterctl_upgrade_test.go | 8 ++++---- test/e2e/config/docker.yaml | 14 ++++++------- test/e2e/quick_start_test.go | 6 ------ test/framework/bootstrap/kind_provider.go | 2 +- .../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 | 5 +++++ 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Tiltfile b/Tiltfile index 1e29f8c4126b..43bfcb87027d 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.28.0" +kubernetes_version = "v1.29.0" load("ext://uibutton", "cmd_button", "location", "text_input") diff --git a/docs/book/src/developer/tilt.md b/docs/book/src/developer/tilt.md index 7d4b89db19c7..1b632738a064 100644 --- a/docs/book/src/developer/tilt.md +++ b/docs/book/src/developer/tilt.md @@ -337,7 +337,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio ```yaml kustomize_substitutions: NAMESPACE: "default" - KUBERNETES_VERSION: "v1.28.0" + KUBERNETES_VERSION: "v1.29.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/reference/versions.md b/docs/book/src/reference/versions.md index 13be6cd25d5c..bb20012968ad 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -133,6 +133,9 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider. #### Kubernetes version specific notes +**1.29**: +* In-tree cloud providers are now switched off by default. Please use DisableCloudProviders and DisableKubeletCloudCredentialProvider feature flags if you still need this functionality. (https://github.com/kubernetes/kubernetes/pull/117503) + **1.28**: * No specific notes diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md index f039a9f06373..8527e3354f18 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -1288,7 +1288,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.28.0 \ + --kubernetes-version v1.29.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1331,7 +1331,7 @@ clusterctl generate cluster capi-quickstart \ ```bash clusterctl generate cluster capi-quickstart \ - --kubernetes-version v1.28.0 \ + --kubernetes-version v1.29.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1385,7 +1385,7 @@ and see an output similar to this: ```bash NAME PHASE AGE VERSION -capi-quickstart Provisioned 8s v1.28.0 +capi-quickstart Provisioned 8s v1.29.0 ``` To verify the first control plane is up: @@ -1398,7 +1398,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.28.0 +capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.29.0 ```