From d6b217339f27eb59bee4f3ce2ff03ad0770acc89 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 10 Aug 2023 07:42:25 +0200 Subject: [PATCH] v1.28: Prepare quickstart, capd and tests for the new release including kind bump --- Tiltfile | 2 +- .../providers/migrations/v1.5-to-v1.6.md | 2 +- docs/book/src/developer/tilt.md | 2 +- docs/book/src/user/quick-start.md | 24 +++++++++---------- hack/ensure-kind.sh | 2 +- test/e2e/clusterctl_upgrade_test.go | 16 ++++++------- test/e2e/config/docker.yaml | 8 +++---- test/framework/bootstrap/kind_provider.go | 2 +- test/go.mod | 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 ++++ 14 files changed, 43 insertions(+), 38 deletions(-) diff --git a/Tiltfile b/Tiltfile index e93549889521..23e276d51ac1 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.27.3" +kubernetes_version = "v1.28.0" load("ext://uibutton", "cmd_button", "location", "text_input") diff --git a/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md b/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md index 99beb7dfb1ab..ecc8a9afc70e 100644 --- a/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md +++ b/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md @@ -11,7 +11,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.20.x +- sigs.k8s.io/kind: v0.20.x => v0.21.x - sigs.k8s.io/controller-runtime: v0.15.x - sigs.k8s.io/controller-tools: v0.12.x diff --git a/docs/book/src/developer/tilt.md b/docs/book/src/developer/tilt.md index 8aa1c2f96db2..f12d69337cd1 100644 --- a/docs/book/src/developer/tilt.md +++ b/docs/book/src/developer/tilt.md @@ -330,7 +330,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio ```yaml kustomize_substitutions: NAMESPACE: "default" - KUBERNETES_VERSION: "v1.27.3" + KUBERNETES_VERSION: "v1.28.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 6debbb334d2d..3e61b17c861f 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -1217,7 +1217,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.27.3 \ + --kubernetes-version v1.28.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1229,7 +1229,7 @@ clusterctl generate cluster capi-quickstart --flavor development \ ```bash export CLUSTER_NAME=kind export CLUSTER_NAMESPACE=vcluster -export KUBERNETES_VERSION=1.27.1 +export KUBERNETES_VERSION=1.28.0 export HELM_VALUES="service:\n type: NodePort" kubectl create namespace ${CLUSTER_NAMESPACE} @@ -1260,7 +1260,7 @@ clusterctl generate cluster capi-quickstart \ ```bash clusterctl generate cluster capi-quickstart \ - --kubernetes-version v1.27.3 \ + --kubernetes-version v1.28.0 \ --control-plane-machine-count=3 \ --worker-machine-count=3 \ > capi-quickstart.yaml @@ -1314,7 +1314,7 @@ and see an output similar to this: ```bash NAME PHASE AGE VERSION -capi-quickstart Provisioned 8s v1.27.3 +capi-quickstart Provisioned 8s v1.28.0 ``` To verify the first control plane is up: @@ -1327,7 +1327,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.27.3 +capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.28.0 ```