From 5f45f22fa9f2aa706244a83aeed4bd9fbfcab274 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 12 Dec 2024 08:25:54 +0100 Subject: [PATCH] Bump Kubernetes in tests to v1.32.0 and claim support for v1.32 --- docs/book/src/reference/versions.md | 3 +++ test/e2e/config/docker.yaml | 8 ++++---- test/infrastructure/docker/examples/machine-pool.yaml | 4 ++-- .../docker/examples/simple-cluster-ipv6.yaml | 4 ++-- .../docker/examples/simple-cluster-without-kcp.yaml | 4 ++-- test/infrastructure/docker/examples/simple-cluster.yaml | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index 9442a107e03c..d165a3a6ff91 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -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. @@ -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. @@ -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. diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml index e8ca8bab2c3b..70af599a2bde 100644 --- a/test/e2e/config/docker.yaml +++ b/test/e2e/config/docker.yaml @@ -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" diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index e657f5fb0d8d..ac4b1c050b41 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -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 @@ -77,7 +77,7 @@ spec: replicas: 2 template: spec: - version: v1.32.0-rc.1 + version: v1.32.0 clusterName: my-cluster bootstrap: configRef: diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index 4a5f5e84d26a..3be4519cab86 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -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 @@ -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: diff --git a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml index 17d576ca1fb0..7aa813edb4fe 100644 --- a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml @@ -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: @@ -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: diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index c37fd45e8420..65b8e974fd0f 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -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 @@ -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: