Skip to content

Commit a68028a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12708 from k8s-infra-cherrypick-robot/cherry-pick-12701-to-release-1.11
[release-1.11] 🌱 Bump to kind v0.30.0
2 parents befa76e + da4e133 commit a68028a

File tree

11 files changed

+54
-33
lines changed

11 files changed

+54
-33
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.33.0"
5+
kubernetes_version = "v1.34.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.27.0 or newer
11+
2. [kind](https://kind.sigs.k8s.io): v0.30.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`
@@ -427,7 +427,7 @@ Custom values for variable substitutions can be set using `kustomize_substitutio
427427
```yaml
428428
kustomize_substitutions:
429429
NAMESPACE: "default"
430-
KUBERNETES_VERSION: "v1.33.0"
430+
KUBERNETES_VERSION: "v1.34.0"
431431
CONTROL_PLANE_MACHINE_COUNT: "1"
432432
WORKER_MACHINE_COUNT: "3"
433433
# 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.27.0
59+
**Minimum [kind] supported version**: v0.30.0
6060

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

@@ -1526,7 +1526,7 @@ The Docker provider is not designed for production use and is intended for devel
15261526
15271527
```bash
15281528
clusterctl generate cluster capi-quickstart --flavor development \
1529-
--kubernetes-version v1.33.0 \
1529+
--kubernetes-version v1.34.0 \
15301530
--control-plane-machine-count=3 \
15311531
--worker-machine-count=3 \
15321532
> capi-quickstart.yaml
@@ -1572,7 +1572,7 @@ clusterctl generate cluster capi-quickstart \
15721572
```bash
15731573
clusterctl generate cluster capi-quickstart \
15741574
--infrastructure azure \
1575-
--kubernetes-version v1.33.0 \
1575+
--kubernetes-version v1.34.0 \
15761576
--control-plane-machine-count=3 \
15771577
--worker-machine-count=3 \
15781578
> capi-quickstart.yaml
@@ -1587,7 +1587,7 @@ yq -i "with(. | select(.kind == \"AzureClusterIdentity\"); .spec.type |= \"Servi
15871587
15881588
```bash
15891589
clusterctl generate cluster capi-quickstart \
1590-
--kubernetes-version v1.33.0 \
1590+
--kubernetes-version v1.34.0 \
15911591
--control-plane-machine-count=3 \
15921592
--worker-machine-count=3 \
15931593
> capi-quickstart.yaml
@@ -1641,7 +1641,7 @@ and see an output similar to this:
16411641
16421642
```bash
16431643
NAME PHASE AGE VERSION
1644-
capi-quickstart Provisioned 8s v1.33.0
1644+
capi-quickstart Provisioned 8s v1.34.0
16451645
```
16461646
16471647
To verify the first control plane is up:
@@ -1654,7 +1654,7 @@ You should see an output is similar to this:
16541654
16551655
```bash
16561656
NAME CLUSTER INITIALIZED API SERVER AVAILABLE REPLICAS READY UPDATED UNAVAILABLE AGE VERSION
1657-
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.33.0
1657+
capi-quickstart-g2trk capi-quickstart true 3 3 3 4m7s v1.34.0
16581658
```
16591659
16601660
<aside class="note warning">
@@ -1808,12 +1808,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
18081808
```
18091809
```bash
18101810
NAME STATUS ROLES AGE VERSION
1811-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.33.0
1812-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.33.0
1813-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.33.0
1814-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.33.0
1815-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.33.0
1816-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.33.0
1811+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.34.0
1812+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.34.0
1813+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.34.0
1814+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.34.0
1815+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.34.0
1816+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.34.0
18171817
```
18181818
18191819
{{#/tab }}
@@ -1897,12 +1897,12 @@ kubectl --kubeconfig=./capi-quickstart.kubeconfig get nodes
18971897
```
18981898
```bash
18991899
NAME STATUS ROLES AGE VERSION
1900-
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.33.0
1901-
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.33.0
1902-
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.33.0
1903-
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.33.0
1904-
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.33.0
1905-
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.33.0
1900+
capi-quickstart-vs89t-gmbld Ready control-plane 5m33s v1.34.0
1901+
capi-quickstart-vs89t-kf9l5 Ready control-plane 6m20s v1.34.0
1902+
capi-quickstart-vs89t-t8cfn Ready control-plane 7m10s v1.34.0
1903+
capi-quickstart-md-0-55x6t-5649968bd7-8tq9v Ready <none> 6m5s v1.34.0
1904+
capi-quickstart-md-0-55x6t-5649968bd7-glnjd Ready <none> 6m9s v1.34.0
1905+
capi-quickstart-md-0-55x6t-5649968bd7-sfzp6 Ready <none> 6m9s v1.34.0
19061906
```
19071907
19081908
{{#/tab }}

‎hack/ensure-kind.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ goarch="$(go env GOARCH)"
3030
goos="$(go env GOOS)"
3131

3232
# 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.29.0
33+
MINIMUM_KIND_VERSION=v0.30.0
3434

3535

3636
# Ensure the kind tool exists and is a viable version, or installs it

‎hack/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ require (
6161
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
6262
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
6363
go.yaml.in/yaml/v2 v2.4.2 // indirect
64-
go.yaml.in/yaml/v3 v3.0.3 // indirect
64+
go.yaml.in/yaml/v3 v3.0.4 // indirect
6565
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6666
sigs.k8s.io/randfill v1.0.0 // indirect
6767
)

‎hack/tools/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
393393
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
394394
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
395395
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
396-
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
397-
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
396+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
397+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
398398
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
399399
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
400400
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

‎test/e2e/config/docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ variables:
371371
# This avoids building node images in the default case which improves the test duration significantly.
372372
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0"
373373
KUBERNETES_VERSION: "v1.34.0"
374-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.1"
374+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.4"
375375
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0"
376376
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.34"
377377
ETCD_VERSION_UPGRADE_TO: "3.6.4-0"

‎test/framework/bootstrap/kind_provider.go‎

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

3838
// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
39-
DefaultNodeImageVersion = "v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f"
39+
DefaultNodeImageVersion = "v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a"
4040
)
4141

4242
// KindClusterOption is a NewKindClusterProvider option.

‎test/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3535
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
3636
sigs.k8s.io/controller-runtime v0.21.0
37-
sigs.k8s.io/kind v0.29.0
37+
sigs.k8s.io/kind v0.30.0
3838
sigs.k8s.io/randfill v1.0.0
3939
sigs.k8s.io/yaml v1.6.0
4040
)
@@ -145,7 +145,7 @@ require (
145145
go.uber.org/multierr v1.11.0 // indirect
146146
go.uber.org/zap v1.27.0 // indirect
147147
go.yaml.in/yaml/v2 v2.4.2 // indirect
148-
go.yaml.in/yaml/v3 v3.0.3 // indirect
148+
go.yaml.in/yaml/v3 v3.0.4 // indirect
149149
golang.org/x/crypto v0.40.0 // indirect
150150
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
151151
golang.org/x/oauth2 v0.30.0 // indirect

‎test/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
365365
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
366366
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
367367
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
368-
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
369-
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
368+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
369+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
370370
go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
371371
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
372372
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -482,8 +482,8 @@ sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytI
482482
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
483483
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
484484
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
485-
sigs.k8s.io/kind v0.29.0 h1:3TpCsyh908IkXXpcSnsMjWdwdWjIl7o9IMZImZCWFnI=
486-
sigs.k8s.io/kind v0.29.0/go.mod h1:ldWQisw2NYyM6k64o/tkZng/1qQW7OlzcN5a8geJX3o=
485+
sigs.k8s.io/kind v0.30.0 h1:2Xi1KFEfSMm0XDcvKnUt15ZfgRPCT0OnCBbpgh8DztY=
486+
sigs.k8s.io/kind v0.30.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
487487
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
488488
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
489489
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

0 commit comments

Comments
 (0)