From cfbde714084b460a574e047c8a886572cca2faf1 Mon Sep 17 00:00:00 2001 From: Oscar Utbult Date: Fri, 2 Sep 2022 08:55:46 +0200 Subject: [PATCH] Use Kubernetes 1.25 in Quick Start docs and CAPD. Use kind 0.15.0 and Calico 3.24.1 in the Quick Start. --- .gitignore | 3 +++ Tiltfile | 2 +- .../src/developer/providers/v1.2-to-v1.3.md | 2 +- docs/book/src/developer/tilt.md | 4 ++-- docs/book/src/user/quick-start.md | 21 ++++++++++++------- hack/ensure-kind.sh | 2 +- test/e2e/config/docker.yaml | 14 ++++++------- test/framework/bootstrap/kind_provider.go | 2 +- test/framework/deployment_helpers.go | 10 ++++----- test/infrastructure/docker/Dockerfile | 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 ++-- .../docker/internal/docker/machine.go | 2 +- 15 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index f03d849841d1..7c17efc3df3f 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,6 @@ _releasenotes # Used during parts of the build process. Files _should_ get cleaned up automatically. # This is also a good location for any temporary manfiests used during development tmp + +# asdf (not a typo! ;) used to manage multiple versions of tools +.tool-versions diff --git a/Tiltfile b/Tiltfile index b5f95b689f8f..f6ba5606ca72 100644 --- a/Tiltfile +++ b/Tiltfile @@ -509,7 +509,7 @@ def cluster_templates(): # Ensure we have default values for a small set of well-known variables substitutions["NAMESPACE"] = substitutions.get("NAMESPACE", "default") - substitutions["KUBERNETES_VERSION"] = substitutions.get("KUBERNETES_VERSION", "v1.24.0") + substitutions["KUBERNETES_VERSION"] = substitutions.get("KUBERNETES_VERSION", "v1.25.0") substitutions["CONTROL_PLANE_MACHINE_COUNT"] = substitutions.get("CONTROL_PLANE_MACHINE_COUNT", "1") substitutions["WORKER_MACHINE_COUNT"] = substitutions.get("WORKER_MACHINE_COUNT", "3") diff --git a/docs/book/src/developer/providers/v1.2-to-v1.3.md b/docs/book/src/developer/providers/v1.2-to-v1.3.md index 619fd9d180d1..8376834e2762 100644 --- a/docs/book/src/developer/providers/v1.2-to-v1.3.md +++ b/docs/book/src/developer/providers/v1.2-to-v1.3.md @@ -12,7 +12,7 @@ maintainers of providers and consumers of our Go API. **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.14.x => v0.15.x ## Changes by Kind diff --git a/docs/book/src/developer/tilt.md b/docs/book/src/developer/tilt.md index 1b9172cc9e3f..afcd517059e7 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 -1. [kind](https://kind.sigs.k8s.io): v0.9 or newer +1. [kind](https://kind.sigs.k8s.io): v0.15 or newer 1. [Tilt](https://docs.tilt.dev/install.html): v0.22.2 or newer 1. [kustomize](https://github.com/kubernetes-sigs/kustomize): provided via `make kustomize` 1. [envsubst](https://github.com/drone/envsubst): provided via `make envsubst` @@ -303,7 +303,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio ```yaml kustomize_substitutions: NAMESPACE: default - KUBERNETES_VERSION: v1.24.0 + KUBERNETES_VERSION: v1.25.0 CONTROL_PLANE_MACHINE_COUNT: 1 WORKER_MACHINE_COUNT: 3 ``` diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md index fed8495fa23e..c4594145a3dd 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -45,7 +45,7 @@ a target [management cluster] on the selected [infrastructure provider]. [kind] is not designed for production use. - **Minimum [kind] supported version**: v0.14.0 + **Minimum [kind] supported version**: v0.15.0 **Help with common issues can be found in the [Troubleshooting Guide](./troubleshooting.md).** @@ -948,7 +948,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.24.0 \ + --kubernetes-version v1.25.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -960,7 +960,7 @@ clusterctl generate cluster capi-quickstart --flavor development \ ```bash export CLUSTER_NAME=kind export CLUSTER_NAMESPACE=vcluster -export KUBERNETES_VERSION=1.23.4 +export KUBERNETES_VERSION=1.25.0 export HELM_VALUES="service:\n type: NodePort" kubectl create namespace ${CLUSTER_NAMESPACE} @@ -975,7 +975,7 @@ clusterctl generate cluster ${CLUSTER_NAME} \ ```bash clusterctl generate cluster capi-quickstart \ - --kubernetes-version v1.24.0 \ + --kubernetes-version v1.25.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1034,8 +1034,8 @@ kubectl get kubeadmcontrolplane You should see an output is similar to this: ```bash -NAME INITIALIZED API SERVER AVAILABLE VERSION REPLICAS READY UPDATED UNAVAILABLE -capi-quickstart-control-plane true v1.24.0 3 3 3 +NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION +capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.25.0 ```