Skip to content

Commit 805064e

Browse files
authored
Merge pull request #12211 from k8s-infra-cherrypick-robot/cherry-pick-12206-to-release-1.10
[release-1.10] ✨ Complete bump to Kubernetes v1.33
2 parents aa8714b + e6da064 commit 805064e

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
clusterctl_cmd = "./bin/clusterctl"
44
kubectl_cmd = "kubectl"
5-
kubernetes_version = "v1.31.2"
5+
kubernetes_version = "v1.33.0"
66

77
load("ext://uibutton", "cmd_button", "location", "text_input")
88

docs/book/src/developer/core/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 (on MacOS e.g. via [Lima](https://github.com/lima-vm/lima))
11-
2. [kind](https://kind.sigs.k8s.io): v0.25.0 or newer
11+
2. [kind](https://kind.sigs.k8s.io): v0.27.0 or newer
1212
3. [Tilt](https://docs.tilt.dev/install.html): v0.30.8 or newer
1313
4. [kustomize](https://github.com/kubernetes-sigs/kustomize): provided via `make kustomize`
1414
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
337337
```yaml
338338
kustomize_substitutions:
339339
NAMESPACE: "default"
340-
KUBERNETES_VERSION: "v1.32.0"
340+
KUBERNETES_VERSION: "v1.33.0"
341341
CONTROL_PLANE_MACHINE_COUNT: "1"
342342
WORKER_MACHINE_COUNT: "3"
343343
# 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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ a target [management cluster] on the selected [infrastructure provider].
5656

5757
[kind] is not designed for production use.
5858

59-
**Minimum [kind] supported version**: v0.25.0
59+
**Minimum [kind] supported version**: v0.27.0
6060

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

@@ -1543,7 +1543,7 @@ The Docker provider is not designed for production use and is intended for devel
15431543
15441544
```bash
15451545
clusterctl generate cluster capi-quickstart --flavor development \
1546-
--kubernetes-version v1.32.0 \
1546+
--kubernetes-version v1.33.0 \
15471547
--control-plane-machine-count=3 \
15481548
--worker-machine-count=3 \
15491549
> capi-quickstart.yaml
@@ -1589,7 +1589,7 @@ clusterctl generate cluster capi-quickstart \
15891589
```bash
15901590
clusterctl generate cluster capi-quickstart \
15911591
--infrastructure azure \
1592-
--kubernetes-version v1.32.0 \
1592+
--kubernetes-version v1.33.0 \
15931593
--control-plane-machine-count=3 \
15941594
--worker-machine-count=3 \
15951595
> capi-quickstart.yaml
@@ -1604,7 +1604,7 @@ yq -i "with(. | select(.kind == \"AzureClusterIdentity\"); .spec.type |= \"Servi
16041604
16051605
```bash
16061606
clusterctl generate cluster capi-quickstart \
1607-
--kubernetes-version v1.32.0 \
1607+
--kubernetes-version v1.33.0 \
16081608
--control-plane-machine-count=3 \
16091609
--worker-machine-count=3 \
16101610
> capi-quickstart.yaml
@@ -1658,7 +1658,7 @@ and see an output similar to this:
16581658
16591659
```bash
16601660
NAME PHASE AGE VERSION
1661-
capi-quickstart Provisioned 8s v1.32.0
1661+
capi-quickstart Provisioned 8s v1.33.0
16621662
```
16631663
16641664
To verify the first control plane is up:
@@ -1671,7 +1671,7 @@ You should see an output is similar to this:
16711671
16721672
```bash
16731673
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1674-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.32.0
1674+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.33.0
16751675
```
16761676
16771677
<aside class="note warning">
@@ -1786,12 +1786,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
17861786
```
17871787
```bash
17881788
NAME STATUS ROLES AGE VERSION
1789-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.32.0
1790-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.32.0
1791-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.32.0
1792-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.32.0
1793-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.32.0
1794-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.32.0
1789+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.33.0
1790+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.33.0
1791+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.33.0
1792+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.33.0
1793+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.33.0
1794+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.33.0
17951795
```
17961796
17971797
{{#/tab }}
@@ -1875,12 +1875,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
18751875
```
18761876
```bash
18771877
NAME STATUS ROLES AGE VERSION
1878-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.32.0
1879-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.32.0
1880-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.32.0
1881-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.32.0
1882-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.32.0
1883-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.32.0
1878+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.33.0
1879+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.33.0
1880+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.33.0
1881+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.33.0
1882+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.33.0
1883+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.33.0
18841884
```
18851885
18861886
{{#/tab }}

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.32.2@sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f"
40+
DefaultNodeImageVersion = "v1.33.0@sha256:02f73d6ae3f11ad5d543f16736a2cb2a63a300ad60e81dac22099b0b04784a4e"
4141
)
4242

4343
// KindClusterOption is a NewKindClusterProvider option.

0 commit comments

Comments
 (0)