Skip to content

Commit

Permalink
Bump Kubernetes in tests to v1.32.0 and claim support for v1.32
Browse files Browse the repository at this point in the history
  • Loading branch information
chrischdi committed Dec 12, 2024
1 parent d8a5dc7 commit 5f45f22
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions docs/book/src/reference/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ These diagrams show the relationships between components in a Cluster API releas
| Kubernetes v1.29 | ✓ >= v1.6.1 ||||
| Kubernetes v1.30 | | ✓ >= v1.7.1 |||
| Kubernetes v1.31 | | | ✓ >= v1.8.1 ||
| Kubernetes v1.32 | | | | ✓ >= v1.9.1 |


\* 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.
Expand All @@ -107,6 +108,7 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
| Kubernetes v1.29 + kubeadm/v1beta3 | ✓ >= v1.6.1 ||||
| Kubernetes v1.30 + kubeadm/v1beta3 | | ✓ >= v1.7.1 |||
| Kubernetes v1.31 + kubeadm/v1beta4 | | | ✓ >= v1.8.1 ||
| Kubernetes v1.31 + kubeadm/v1beta4 | | | | ✓ >= v1.9.1 |

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

Expand All @@ -124,6 +126,7 @@ The Kubeadm Bootstrap Provider generates kubeadm configuration using the API ver
| Kubernetes v1.29 + etcd/v3 | ✓ >= v1.6.1 ||||
| Kubernetes v1.30 + etcd/v3 | | ✓ >= v1.7.1 |||
| Kubernetes v1.31 + etcd/v3 | | | ✓ >= v1.8.1 ||
| Kubernetes v1.31 + etcd/v3 | | | | ✓ >= v1.9.1 |

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.

Expand Down
8 changes: 4 additions & 4 deletions test/e2e/config/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,10 @@ variables:
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
# This avoids building node images in the default case which improves the test duration significantly.
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0-rc.1"
KUBERNETES_VERSION: "v1.32.0-rc.1"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.2"
KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0-rc.1"
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0"
KUBERNETES_VERSION: "v1.32.0"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.4"
KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0"
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.32"
ETCD_VERSION_UPGRADE_TO: "3.5.16-0"
COREDNS_VERSION_UPGRADE_TO: "v1.11.3"
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/machine-pool.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.32.0-rc.1
version: v1.32.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
replicas: 2
template:
spec:
version: v1.32.0-rc.1
version: v1.32.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.32.0-rc.1
version: v1.32.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.32.0-rc.1
version: v1.32.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
name: controlplane-0
namespace: default
spec:
version: v1.32.0-rc.1
version: v1.32.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.32.0-rc.1
version: v1.32.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.32.0-rc.1
version: v1.32.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.32.0-rc.1
version: v1.32.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down

0 comments on commit 5f45f22

Please sign in to comment.