Skip to content

Commit 4d35940

Browse files
committed
Bump Kubernetes in tests to v1.31.0 and claim support for v1.31
1 parent 0440940 commit 4d35940

File tree

6 files changed

+23
-12
lines changed

6 files changed

+23
-12
lines changed

docs/book/src/reference/versions.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ These diagrams show the relationships between components in a Cluster API releas
8585
| Kubernetes v1.28 | ✓ >= v1.5.1 ||||
8686
| Kubernetes v1.29 | | ✓ >= v1.6.1 |||
8787
| Kubernetes v1.30 | | | ✓ >= v1.7.1 ||
88+
| Kubernetes v1.31 | | | | ✓ >= v1.8.1 |
8889

8990

9091
\* There is an issue with CRDs in Kubernetes v1.23.{0-2}. ClusterClass with patches is affected by that (for more details please see [this issue](https://github.com/kubernetes-sigs/cluster-api/issues/5990)). Therefore we recommend to use Kubernetes v1.23.3+ with ClusterClass.
@@ -105,6 +106,7 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
105106
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ >= v1.5.1 ||||
106107
| Kubernetes v1.29 + kubeadm/v1beta3 | | ✓ >= v1.6.1 |||
107108
| Kubernetes v1.30 + kubeadm/v1beta3 | | | ✓ >= v1.7.1 ||
109+
| Kubernetes v1.31 + kubeadm/v1beta4 | | | | ✓ >= v1.8.1 |
108110

109111
The Kubeadm Bootstrap Provider generates kubeadm configuration using the API version recommended for the target Kubernetes version.
110112

@@ -121,6 +123,7 @@ The Kubeadm Bootstrap Provider generates kubeadm configuration using the API ver
121123
| Kubernetes v1.28 + etcd/v3 | ✓ >= v1.5.1 ||||
122124
| Kubernetes v1.29 + etcd/v3 | | ✓ >= v1.6.1 |||
123125
| Kubernetes v1.30 + etcd/v3 | | | ✓ >= v1.7.1 ||
126+
| Kubernetes v1.31 + etcd/v3 | | | | ✓ >= v1.8.1 |
124127

125128
The Kubeadm Control Plane Provider talks to the API server and etcd members of every Workload Cluster whose control plane it owns. It uses the etcd v3 API.
126129

@@ -140,6 +143,14 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
140143

141144
#### Kubernetes version specific notes
142145

146+
**1.31**:
147+
148+
* All providers:
149+
* It is not possible anymore to continuously apply CRDs that are setting `caBundle` to an invalid value (in our case `Cg==`). Instead of setting a dummy value the `caBundle` field should be dropped ([#10972](https://github.com/kubernetes-sigs/cluster-api/pull/10972)).
150+
* Kubeadm Bootstrap Provider:
151+
* `kubeadm` dropped the `control-plane update-status` phase which was used in ExperimentalRetryJoin ([#10983](https://github.com/kubernetes-sigs/cluster-api/pull/10983)).
152+
* `kubeadm` introduced the experimental `ControlPlaneKubeletLocalMode` feature gate which will be automatically enabled by CAPI for upgrades to v1.31 to not cause network disruptions ([#10947](https://github.com/kubernetes-sigs/cluster-api/pull/10947)).
153+
143154
**1.29**:
144155
* In-tree cloud providers are now switched off by default. Please use DisableCloudProviders and DisableKubeletCloudCredentialProvider feature flags if you still need this functionality. (https://github.com/kubernetes/kubernetes/pull/117503)
145156

test/e2e/config/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@ variables:
353353
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
354354
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
355355
# This avoids building node images in the default case which improves the test duration significantly.
356-
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0-rc.1"
357-
KUBERNETES_VERSION: "v1.31.0-rc.1"
356+
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
357+
KUBERNETES_VERSION: "v1.31.0"
358358
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.2"
359-
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0-rc.1"
360-
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
359+
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0"
360+
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.32"
361361
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
362362
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
363363
DOCKER_SERVICE_DOMAIN: "cluster.local"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.31.0-rc.1
38+
version: v1.31.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -77,7 +77,7 @@ spec:
7777
replicas: 2
7878
template:
7979
spec:
80-
version: v1.31.0-rc.1
80+
version: v1.31.0
8181
clusterName: my-cluster
8282
bootstrap:
8383
configRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.31.0-rc.1
38+
version: v1.31.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -87,7 +87,7 @@ spec:
8787
cluster.x-k8s.io/cluster-name: my-cluster
8888
template:
8989
spec:
90-
version: v1.31.0-rc.1
90+
version: v1.31.0
9191
clusterName: my-cluster
9292
bootstrap:
9393
configRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
name: controlplane-0
3333
namespace: default
3434
spec:
35-
version: v1.31.0-rc.1
35+
version: v1.31.0
3636
clusterName: my-cluster
3737
bootstrap:
3838
configRef:
@@ -76,7 +76,7 @@ spec:
7676
cluster.x-k8s.io/cluster-name: my-cluster
7777
template:
7878
spec:
79-
version: v1.31.0-rc.1
79+
version: v1.31.0
8080
clusterName: my-cluster
8181
bootstrap:
8282
configRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
namespace: default
3636
spec:
3737
replicas: 1
38-
version: v1.31.0-rc.1
38+
version: v1.31.0
3939
machineTemplate:
4040
infrastructureRef:
4141
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -80,7 +80,7 @@ spec:
8080
cluster.x-k8s.io/cluster-name: my-cluster
8181
template:
8282
spec:
83-
version: v1.31.0-rc.1
83+
version: v1.31.0
8484
clusterName: my-cluster
8585
bootstrap:
8686
configRef:

0 commit comments

Comments
 (0)