Skip to content

Commit 6ff7c4c

Browse files
authored
Merge pull request #12705 from k8s-infra-cherrypick-robot/cherry-pick-12699-to-release-1.11
[release-1.11] ✨ Bump Kubernetes in tests to v1.34.0 and claim support for v1.34
2 parents 69a3492 + 6a61a8d commit 6ff7c4c

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

docs/book/src/reference/versions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ See [Cluster API release support](#cluster-api-release-support) and [Kubernetes
282282
| Kubernetes v1.31 ||||
283283
| Kubernetes v1.32 | ✓ >= v1.9.1 |||
284284
| Kubernetes v1.33 | | ✓ >= v1.10.1 ||
285+
| Kubernetes v1.34 | | | ✓ >= v1.11.1 |
285286

286287
See also [Kubernetes version specific notes](#kubernetes-version-specific-notes).
287288

@@ -312,6 +313,7 @@ using the [kubeadm API](https://kubernetes.io/docs/setup/production-environment/
312313
| Kubernetes v1.31 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) |
313314
| Kubernetes v1.32 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) |
314315
| Kubernetes v1.33 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) |
316+
| Kubernetes v1.34 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) |
315317

316318
### Kubeadm Control Plane provider (`kubeadm-control-plane-controller`)
317319

test/e2e/config/docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ variables:
369369
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
370370
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
371371
# This avoids building node images in the default case which improves the test duration significantly.
372-
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0-rc.2"
373-
KUBERNETES_VERSION: "v1.34.0-rc.2"
372+
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0"
373+
KUBERNETES_VERSION: "v1.34.0"
374374
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.1"
375-
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0-rc.2"
375+
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"
378378
COREDNS_VERSION_UPGRADE_TO: "v1.12.1"

test/infrastructure/docker/examples/machine-pool.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
namespace: default
3434
spec:
3535
replicas: 1
36-
version: v1.34.0-rc.2
36+
version: v1.34.0
3737
machineTemplate:
3838
spec:
3939
infrastructureRef:
@@ -80,7 +80,7 @@ spec:
8080
replicas: 2
8181
template:
8282
spec:
83-
version: v1.34.0-rc.2
83+
version: v1.34.0
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

test/infrastructure/docker/examples/simple-cluster-ipv6.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
namespace: default
3434
spec:
3535
replicas: 1
36-
version: v1.34.0-rc.2
36+
version: v1.34.0
3737
machineTemplate:
3838
spec:
3939
infrastructureRef:
@@ -92,7 +92,7 @@ spec:
9292
cluster.x-k8s.io/cluster-name: my-cluster
9393
template:
9494
spec:
95-
version: v1.34.0-rc.2
95+
version: v1.34.0
9696
clusterName: my-cluster
9797
bootstrap:
9898
configRef:

test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
name: controlplane-0
3232
namespace: default
3333
spec:
34-
version: v1.34.0-rc.2
34+
version: v1.34.0
3535
clusterName: my-cluster
3636
bootstrap:
3737
configRef:
@@ -74,7 +74,7 @@ spec:
7474
cluster.x-k8s.io/cluster-name: my-cluster
7575
template:
7676
spec:
77-
version: v1.34.0-rc.2
77+
version: v1.34.0
7878
clusterName: my-cluster
7979
bootstrap:
8080
configRef:

test/infrastructure/docker/examples/simple-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
namespace: default
3434
spec:
3535
replicas: 1
36-
version: v1.34.0-rc.2
36+
version: v1.34.0
3737
machineTemplate:
3838
spec:
3939
infrastructureRef:
@@ -83,7 +83,7 @@ spec:
8383
cluster.x-k8s.io/cluster-name: my-cluster
8484
template:
8585
spec:
86-
version: v1.34.0-rc.2
86+
version: v1.34.0
8787
clusterName: my-cluster
8888
bootstrap:
8989
configRef:

0 commit comments

Comments
 (0)