From 14eaeee0b875ee3977b9e3ddab5c914350973ff1 Mon Sep 17 00:00:00 2001 From: chandankumar4 Date: Mon, 29 Apr 2024 18:06:49 +0530 Subject: [PATCH] Update CAPI support and guarantees for v1.8 Signed-off-by: chandankumar4 --- CONTRIBUTING.md | 25 ++++++------ docs/book/src/reference/versions.md | 63 ++++++++++++++--------------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55f817909a55..1928cec91491 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,18 +163,19 @@ Cluster API maintains the most recent release/releases for all supported API and - We will maintain test coverage for all supported minor releases and for one additional release for the current stable API version in case we have to do an emergency patch release. For example, if v1.2 and v1.3 are currently supported, we will also maintain test coverage for v1.1 for one additional release cycle. When v1.4 is released, tests for v1.1 will be removed. -| Minor Release | API Version | Supported Until | -|---------------|--------------|-----------------------------------------------------| -| v1.7.x | **v1beta1** | when v1.9.0 will be released | -| v1.6.x | **v1beta1** | when v1.8.0 will be released | -| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date | -| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date | -| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date | -| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date | -| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) | -| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) | -| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL | -| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL | +| Minor Release | API Version | Supported Until | +|---------------|--------------|------------------------------------------------| +| v1.8.x | **v1beta1** | when v1.10.0 will be released | +| v1.7.x | **v1beta1** | when v1.9.0 will be released | +| v1.6.x | **v1beta1** | when v1.8.0 will be released | +| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date | +| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date | +| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date | +| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date | +| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) | +| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) | +| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL | +| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL | (*) Previous support policy applies, older minor releases were immediately unsupported when a new major/minor release was available diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index af2e9bcd38b9..00d260627abf 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -74,18 +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) | +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (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 | +| Kubernetes v1.22 | ✓ (only workload) | | | | +| Kubernetes v1.23* | ✓ (only workload) | ✓ (only workload) | | | +| Kubernetes v1.24 | ✓ | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.25 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ (only workload) | +| 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. @@ -95,35 +94,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) | +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (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 | +| 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) | ✓ (only workload) | +| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) | +| 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) | +| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (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 | +| 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) | ✓ (only workload) | +| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) | +| 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.