Skip to content

Commit db72647

Browse files
Update KIND to v0.20.0
Signed-off-by: killianmuldoon <[email protected]>
1 parent ff78516 commit db72647

File tree

14 files changed

+39
-36
lines changed

14 files changed

+39
-36
lines changed

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envsubst_cmd = "./hack/tools/bin/envsubst"
44
clusterctl_cmd = "./bin/clusterctl"
55
kubectl_cmd = "kubectl"
66
default_build_engine = "docker"
7-
kubernetes_version = "v1.27.1"
7+
kubernetes_version = "v1.27.3"
88

99
if str(local("command -v " + kubectl_cmd + " || true", quiet = True)) == "":
1010
fail("Required command '" + kubectl_cmd + "' not found in PATH")

docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers of providers and consumers of our Go API.
1111

1212
**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`.
1313

14-
- sigs.k8s.io/kind: v0.17.x => v0.19.x
14+
- sigs.k8s.io/kind: v0.17.x => v0.20.x
1515
- sigs.k8s.io/controller-runtime: v0.14.x => v0.15.x
1616
- sigs.k8s.io/controller-tools: v0.11.x => v0.12.x
1717

docs/book/src/developer/tilt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ workflow that offers easy deployments and rapid iterative builds.
88
## Prerequisites
99

1010
1. [Docker](https://docs.docker.com/install/): v19.03 or newer
11-
1. [kind](https://kind.sigs.k8s.io): v0.19 or newer
11+
1. [kind](https://kind.sigs.k8s.io): v0.20.0 or newer
1212
1. [Tilt](https://docs.tilt.dev/install.html): v0.30.8 or newer
1313
1. [kustomize](https://github.com/kubernetes-sigs/kustomize): provided via `make kustomize`
1414
1. [envsubst](https://github.com/drone/envsubst): provided via `make envsubst`
@@ -326,7 +326,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
326326
```yaml
327327
kustomize_substitutions:
328328
NAMESPACE: "default"
329-
KUBERNETES_VERSION: "v1.27.1"
329+
KUBERNETES_VERSION: "v1.27.3"
330330
CONTROL_PLANE_MACHINE_COUNT: "1"
331331
WORKER_MACHINE_COUNT: "3"
332332
# Note: kustomize substitutions expects the values to be strings. This can be achieved by wrapping the values in quotation marks.

docs/book/src/user/quick-start.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ a target [management cluster] on the selected [infrastructure provider].
4646

4747
[kind] is not designed for production use.
4848

49-
**Minimum [kind] supported version**: v0.19.0
49+
**Minimum [kind] supported version**: v0.20.0
5050

5151
**Help with common issues can be found in the [Troubleshooting Guide](./troubleshooting.md).**
5252

@@ -1217,7 +1217,7 @@ The Docker provider is not designed for production use and is intended for devel
12171217
12181218
```bash
12191219
clusterctl generate cluster capi-quickstart --flavor development \
1220-
--kubernetes-version v1.27.1 \
1220+
--kubernetes-version v1.27.3 \
12211221
--control-plane-machine-count=3 \
12221222
--worker-machine-count=3 \
12231223
> capi-quickstart.yaml
@@ -1260,7 +1260,7 @@ clusterctl generate cluster capi-quickstart \
12601260
12611261
```bash
12621262
clusterctl generate cluster capi-quickstart \
1263-
--kubernetes-version v1.27.1 \
1263+
--kubernetes-version v1.27.3 \
12641264
--control-plane-machine-count=3 \
12651265
--worker-machine-count=3 \
12661266
> capi-quickstart.yaml
@@ -1314,7 +1314,7 @@ and see an output similar to this:
13141314
13151315
```bash
13161316
NAME PHASE AGE VERSION
1317-
capi-quickstart Provisioned 8s v1.27.1
1317+
capi-quickstart Provisioned 8s v1.27.3
13181318
```
13191319
13201320
To verify the first control plane is up:
@@ -1327,7 +1327,7 @@ You should see an output is similar to this:
13271327
13281328
```bash
13291329
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1330-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.27.1
1330+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.27.3
13311331
```
13321332
13331333
<aside class="note warning">
@@ -1547,12 +1547,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
15471547
```
15481548
```bash
15491549
NAME STATUS ROLES AGE VERSION
1550-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.27.1
1551-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.27.1
1552-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.27.1
1553-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.27.1
1554-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.27.1
1555-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.27.1
1550+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.27.3
1551+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.27.3
1552+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.27.3
1553+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.27.3
1554+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.27.3
1555+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.27.3
15561556
```
15571557
15581558
{{#/tab }}

hack/ensure-kind.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ fi
2626
source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
2727

2828
GOPATH_BIN="$(go env GOPATH)/bin"
29-
MINIMUM_KIND_VERSION=v0.19.0
3029
goarch="$(go env GOARCH)"
3130
goos="$(go env GOOS)"
3231

32+
# Note: When updating the MINIMUM_KIND_VERSION new shas MUST be added in `preBuiltMappings` at `test/infrastructure/kind/mapper.go`
33+
MINIMUM_KIND_VERSION=v0.20.0
34+
35+
3336
# Ensure the kind tool exists and is a viable version, or installs it
3437
verify_kind_version() {
3538

test/e2e/clusterctl_upgrade_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
191191
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
192192
InitWithProvidersContract: "v1beta1",
193193
// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.4/bases.
194-
InitWithKubernetesVersion: "v1.27.1",
195-
WorkloadKubernetesVersion: "v1.27.1",
194+
InitWithKubernetesVersion: "v1.27.3",
195+
WorkloadKubernetesVersion: "v1.27.3",
196196
MgmtFlavor: "topology",
197197
WorkloadFlavor: "",
198198
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
@@ -222,8 +222,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>cur
222222
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
223223
InitWithProvidersContract: "v1beta1",
224224
// NOTE: If this version is changed here the image and SHA must also be updated in all DockerMachineTemplates in `test/data/infrastructure-docker/v1.4/bases.
225-
InitWithKubernetesVersion: "v1.27.1",
226-
WorkloadKubernetesVersion: "v1.27.1",
225+
InitWithKubernetesVersion: "v1.27.3",
226+
WorkloadKubernetesVersion: "v1.27.3",
227227
MgmtFlavor: "topology",
228228
WorkloadFlavor: "topology",
229229
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.

test/e2e/config/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@ variables:
275275
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
276276
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
277277
# This avoids building node images in the default case which improves the test duration significantly.
278-
KUBERNETES_VERSION_MANAGEMENT: "v1.27.1"
279-
KUBERNETES_VERSION: "v1.27.1"
280-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.4"
281-
KUBERNETES_VERSION_UPGRADE_TO: "v1.27.1"
278+
KUBERNETES_VERSION_MANAGEMENT: "v1.27.3"
279+
KUBERNETES_VERSION: "v1.27.3"
280+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.6"
281+
KUBERNETES_VERSION_UPGRADE_TO: "v1.27.3"
282282
ETCD_VERSION_UPGRADE_TO: "3.5.7-0"
283283
COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
284284
DOCKER_SERVICE_DOMAIN: "cluster.local"

test/framework/bootstrap/kind_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
DefaultNodeImageRepository = "kindest/node"
3838

3939
// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
40-
DefaultNodeImageVersion = "v1.27.1"
40+
DefaultNodeImageVersion = "v1.27.3"
4141
)
4242

4343
// KindClusterOption is a NewKindClusterProvider option.

test/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
k8s.io/utils v0.0.0-20230209194617-a36077c30491
3131
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
3232
sigs.k8s.io/controller-runtime v0.15.0
33-
sigs.k8s.io/kind v0.19.0
33+
sigs.k8s.io/kind v0.20.0
3434
sigs.k8s.io/yaml v1.3.0
3535
)
3636

test/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,8 +948,8 @@ sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0
948948
sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
949949
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
950950
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
951-
sigs.k8s.io/kind v0.19.0 h1:ZSUh6/kpab6fiowT6EqL4k8xSbedI2NWxyuUOtoPFe4=
952-
sigs.k8s.io/kind v0.19.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs=
951+
sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8=
952+
sigs.k8s.io/kind v0.20.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs=
953953
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
954954
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
955955
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

0 commit comments

Comments
 (0)