From cc82120f4d5bc4c9a08e381ea0bd04f138bdde8b Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Mon, 29 Apr 2024 17:32:27 +0200 Subject: [PATCH] Drop v1.4 column, set v1.5 to EOL in versions.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- docs/book/src/reference/versions.md | 70 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index af2e9bcd38b9..66c762100c9f 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -74,19 +74,17 @@ These diagrams show the relationships between components in a Cluster API releas #### Core Provider (`cluster-api-controller`) -| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) | -|-------------------|----------------------|-------------------|-------------------|-------------------| -| Kubernetes v1.21 | ✓ (only workload) | | | | -| Kubernetes v1.22 | ✓ (only workload) | ✓ (only workload) | | | -| Kubernetes v1.23* | ✓ | ✓ (only workload) | ✓ (only workload) | | -| Kubernetes v1.24 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | -| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ (only workload) | -| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ | -| Kubernetes v1.27 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ | -| Kubernetes v1.28 | | ✓ >= v1.5.1 | ✓ | ✓ | -| Kubernetes v1.29 | | | ✓ >= v1.6.1 | ✓ | -| Kubernetes v1.30 | | | | ✓ >= v1.7.1 | - +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | +|-------------------|----------------------|-------------------|-------------------| +| Kubernetes v1.22 | ✓ (only workload) | | | +| Kubernetes v1.23* | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.24 | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.25 | ✓ | ✓ | ✓ (only workload) | +| Kubernetes v1.26 | ✓ | ✓ | ✓ | +| Kubernetes v1.27 | ✓ | ✓ | ✓ | +| Kubernetes v1.28 | ✓ >= v1.5.1 | ✓ | ✓ | +| Kubernetes v1.29 | | ✓ >= v1.6.1 | ✓ | +| Kubernetes v1.30 | | | ✓ >= v1.7.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. Previous Kubernetes **minor** versions are not affected. @@ -95,35 +93,33 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore, #### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`) -| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) | -|------------------------------------|----------------------|--------------------|--------------------|--------------------| -| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ (only workload) | | | | -| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | | -| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | | -| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | -| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) | -| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ | -| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ | -| Kubernetes v1.28 + kubeadm/v1beta3 | | ✓ >= v1.5.1 | ✓ | ✓ | -| Kubernetes v1.29 + kubeadm/v1beta3 | | | ✓ >= v1.6.1 | ✓ | -| Kubernetes v1.30 + kubeadm/v1beta3 | | | | ✓ >= v1.7.1 | +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | +|------------------------------------|----------------------|--------------------|--------------------| +| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | | | +| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | +| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | +| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | +| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ >= v1.5.1 | ✓ | ✓ | +| Kubernetes v1.29 + kubeadm/v1beta3 | | ✓ >= v1.6.1 | ✓ | +| Kubernetes v1.30 + kubeadm/v1beta3 | | | ✓ >= v1.7.1 | The Kubeadm Bootstrap Provider generates kubeadm configuration using the API version recommended for the target Kubernetes version. #### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`) -| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) | -|----------------------------|----------------------|-------------------|-------------------|-------------------| -| Kubernetes v1.21 + etcd/v3 | ✓ (only workload) | | | | -| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | | -| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | | -| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | -| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) | -| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | -| Kubernetes v1.27 + etcd/v3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ | -| Kubernetes v1.28 + etcd/v3 | | ✓ >= v1.5.1 | ✓ | ✓ | -| Kubernetes v1.29 + etcd/v3 | | | ✓ >= v1.6.1 | ✓ | -| Kubernetes v1.30 + etcd/v3 | | | | ✓ >= v1.7.1 | +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | +|----------------------------|----------------------|-------------------|-------------------| +| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | | | +| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | +| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | +| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ | +| Kubernetes v1.28 + etcd/v3 | ✓ >= v1.5.1 | ✓ | ✓ | +| Kubernetes v1.29 + etcd/v3 | | ✓ >= v1.6.1 | ✓ | +| Kubernetes v1.30 + etcd/v3 | | | ✓ >= v1.7.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.