Skip to content

Commit 9a94459

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#10529 from chandankumar4/support-1.8
📖 Update CAPI support and guarantees for v1.8
2 parents b29e26c + 14eaeee commit 9a94459

File tree

2 files changed

+43
-45
lines changed

2 files changed

+43
-45
lines changed

‎CONTRIBUTING.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,19 @@ Cluster API maintains the most recent release/releases for all supported API and
163163
- 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.
164164
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.
165165

166-
| Minor Release | API Version | Supported Until |
167-
|---------------|--------------|-----------------------------------------------------|
168-
| v1.7.x | **v1beta1** | when v1.9.0 will be released |
169-
| v1.6.x | **v1beta1** | when v1.8.0 will be released |
170-
| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date |
171-
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
172-
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
173-
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
174-
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
175-
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
176-
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
177-
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
166+
| Minor Release | API Version | Supported Until |
167+
|---------------|--------------|------------------------------------------------|
168+
| v1.8.x | **v1beta1** | when v1.10.0 will be released |
169+
| v1.7.x | **v1beta1** | when v1.9.0 will be released |
170+
| v1.6.x | **v1beta1** | when v1.8.0 will be released |
171+
| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date |
172+
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
173+
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
174+
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
175+
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
176+
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
177+
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
178+
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
178179

179180
(*) Previous support policy applies, older minor releases were immediately unsupported when a new major/minor release was available
180181

‎docs/book/src/reference/versions.md

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,17 @@ These diagrams show the relationships between components in a Cluster API releas
7474

7575
#### Core Provider (`cluster-api-controller`)
7676

77-
| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
77+
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
7878
|-------------------|----------------------|-------------------|-------------------|-------------------|
79-
| Kubernetes v1.21 | ✓ (only workload) | | | |
80-
| Kubernetes v1.22 | ✓ (only workload) | ✓ (only workload) | | |
81-
| Kubernetes v1.23* | ✓ | ✓ (only workload) | ✓ (only workload) | |
82-
| Kubernetes v1.24 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
83-
| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ (only workload) |
84-
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ |
85-
| Kubernetes v1.27 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
86-
| Kubernetes v1.28 | | ✓ >= v1.5.1 | ✓ | ✓ |
87-
| Kubernetes v1.29 | | | ✓ >= v1.6.1 | ✓ |
88-
| Kubernetes v1.30 | | | | ✓ >= v1.7.1 |
79+
| Kubernetes v1.22 | ✓ (only workload) | | | |
80+
| Kubernetes v1.23* | ✓ (only workload) | ✓ (only workload) | | |
81+
| Kubernetes v1.24 | ✓ | ✓ (only workload) | ✓ (only workload) | |
82+
| Kubernetes v1.25 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
83+
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ (only workload) |
84+
| Kubernetes v1.27 | ✓ | ✓ | ✓ | ✓ |
85+
| Kubernetes v1.28 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
86+
| Kubernetes v1.29 | | ✓ >= v1.6.1 | ✓ | ✓ |
87+
| Kubernetes v1.30 | | | ✓ >= v1.7.1 | ✓ |
8988

9089

9190
\* 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,
9594

9695
#### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`)
9796

98-
| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
97+
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
9998
|------------------------------------|----------------------|--------------------|--------------------|--------------------|
100-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ (only workload) | | | |
101-
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | |
102-
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
103-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
104-
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
105-
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
106-
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
107-
| Kubernetes v1.28 + kubeadm/v1beta3 | | ✓ >= v1.5.1 | ✓ | ✓ |
108-
| Kubernetes v1.29 + kubeadm/v1beta3 | | | ✓ >= v1.6.1 | ✓ |
109-
| Kubernetes v1.30 + kubeadm/v1beta3 | | | | ✓ >= v1.7.1 |
99+
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | | | |
100+
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | |
101+
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
102+
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
103+
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
104+
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
105+
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
106+
| Kubernetes v1.29 + kubeadm/v1beta3 | | ✓ >= v1.6.1 | ✓ | ✓ |
107+
| Kubernetes v1.30 + kubeadm/v1beta3 | | | ✓ >= v1.7.1 | ✓ |
110108

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

113111
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
114112

115-
| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
113+
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
116114
|----------------------------|----------------------|-------------------|-------------------|-------------------|
117-
| Kubernetes v1.21 + etcd/v3 | ✓ (only workload) | | | |
118-
| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
119-
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
120-
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
121-
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
122-
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
123-
| Kubernetes v1.27 + etcd/v3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
124-
| Kubernetes v1.28 + etcd/v3 | | ✓ >= v1.5.1 | ✓ | ✓ |
125-
| Kubernetes v1.29 + etcd/v3 | | | ✓ >= v1.6.1 | ✓ |
126-
| Kubernetes v1.30 + etcd/v3 | | | | ✓ >= v1.7.1 |
115+
| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | | | |
116+
| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
117+
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
118+
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
119+
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
120+
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
121+
| Kubernetes v1.28 + etcd/v3 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
122+
| Kubernetes v1.29 + etcd/v3 | | ✓ >= v1.6.1 | ✓ | ✓ |
123+
| Kubernetes v1.30 + etcd/v3 | | | ✓ >= v1.7.1 | ✓ |
127124

128125
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.
129126

0 commit comments

Comments
 (0)