Skip to content

Commit 27ca530

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11703 from chandankumar4/update-versions-1-10
📖 Update CAPI support and guarantees for v1.10
2 parents f825b72 + 475eb31 commit 27ca530

File tree

2 files changed

+44
-43
lines changed

2 files changed

+44
-43
lines changed

‎CONTRIBUTING.md

+15-14
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,21 @@ Cluster API maintains the most recent release/releases for all supported API and
138138
- 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.
139139
For example, if v1.6 and v1.7 are currently supported, we will also maintain test coverage for v1.5 for one additional release cycle. When v1.8 is released, tests for v1.5 will be removed.
140140

141-
| Minor Release | API Version | Supported Until |
142-
|---------------|--------------|------------------------------------------------|
143-
| v1.9.x | **v1beta1** | when v1.11.0 will be released |
144-
| v1.8.x | **v1beta1** | when v1.10.0 will be released |
145-
| v1.7.x | **v1beta1** | EOL since 2024-12-10 - v1.9.0 release date |
146-
| v1.6.x | **v1beta1** | EOL since 2024-08-12 - v1.8.0 release date |
147-
| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date |
148-
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
149-
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
150-
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
151-
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
152-
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
153-
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
154-
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
141+
| Minor Release | API Version | Supported Until |
142+
|---------------|--------------|--------------------------------------------------|
143+
| v1.10.x | **v1beta1** | when v1.12.0 will be released |
144+
| v1.9.x | **v1beta1** | when v1.11.0 will be released |
145+
| v1.8.x | **v1beta1** | when v1.10.0 will be released |
146+
| v1.7.x | **v1beta1** | EOL since 2024-12-10 - v1.9.0 release date |
147+
| v1.6.x | **v1beta1** | EOL since 2024-08-12 - v1.8.0 release date |
148+
| v1.5.x | **v1beta1** | EOL since 2024-04-16 - v1.7.0 release date |
149+
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
150+
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
151+
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
152+
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
153+
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
154+
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
155+
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
155156

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

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

+29-29
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ These diagrams show the relationships between components in a Cluster API releas
7474

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

77-
| | v1.7 (v1beta1) EOL | v1.8 (v1beta1) | v1.9 (v1beta1) |
77+
| | v1.8 (v1beta1) EOL | v1.9 (v1beta1) | v1.10 (v1beta1) |
7878
|-------------------|--------------------|-------------------|-------------------|
79-
| Kubernetes v1.24 | ✓ (only workload) | | |
80-
| Kubernetes v1.25 | ✓ (only workload) | ✓ (only workload) | |
81-
| Kubernetes v1.26 | ✓ | ✓ (only workload) | ✓ (only workload) |
82-
| Kubernetes v1.27 | ✓ | ✓ | ✓ (only workload) |
83-
| Kubernetes v1.28 | ✓ | ✓ | ✓ |
79+
| Kubernetes v1.24 | | | |
80+
| Kubernetes v1.25 | ✓ (only workload) | | |
81+
| Kubernetes v1.26 | ✓ (only workload) | ✓ (only workload) | |
82+
| Kubernetes v1.27 | ✓ | ✓ (only workload) | ✓ (only workload) |
83+
| Kubernetes v1.28 | ✓ | ✓ | ✓ (only workload) |
8484
| Kubernetes v1.29 | ✓ | ✓ | ✓ |
85-
| Kubernetes v1.30 | ✓ >= v1.7.1 | ✓ | ✓ |
86-
| Kubernetes v1.31 | | ✓ >= v1.8.1 | ✓ |
87-
| Kubernetes v1.32 | | | ✓ >= v1.9.1 |
85+
| Kubernetes v1.30 | ✓ | ✓ | ✓ |
86+
| Kubernetes v1.31 | ✓ >= v1.8.1 | ✓ | ✓ |
87+
| Kubernetes v1.32 | | ✓ >= v1.9.1 | ✓ |
8888

8989

9090
\* 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.
@@ -94,33 +94,33 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
9494

9595
#### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`)
9696

97-
| | v1.7 (v1beta1) EOL | v1.8 (v1beta1) | v1.9 (v1beta1) |
98-
|------------------------------------|--------------------|--------------------|--------------------|
99-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ (only workload) | | |
100-
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | |
101-
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) |
102-
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) |
103-
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
104-
| Kubernetes v1.29 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
105-
| Kubernetes v1.30 + kubeadm/v1beta3 | ✓ >= v1.7.1 | ✓ | ✓ |
106-
| Kubernetes v1.31 + kubeadm/v1beta4 | | ✓ >= v1.8.1 | ✓ |
107-
| Kubernetes v1.32 + kubeadm/v1beta4 | | | ✓ >= v1.9.1 |
97+
| | v1.8 (v1beta1) EOL | v1.9 (v1beta1) | v1.10 (v1beta1) |
98+
|------------------------------------|---------------------|--------------------|--------------------|
99+
| Kubernetes v1.24 + kubeadm/v1beta3 | | | |
100+
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ (only workload) | | |
101+
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | |
102+
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) |
103+
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) |
104+
| Kubernetes v1.29 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
105+
| Kubernetes v1.30 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
106+
| Kubernetes v1.31 + kubeadm/v1beta4 | ✓ >= v1.8.1 | ✓ | ✓ |
107+
| Kubernetes v1.32 + kubeadm/v1beta4 | | ✓ >= v1.9.1 | ✓ |
108108

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

111111
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
112112

113-
| | v1.7 (v1beta1) EOL | v1.8 (v1beta1) | v1.9 (v1beta1) |
113+
| | v1.8 (v1beta1) EOL | v1.9 (v1beta1) | v1.10 (v1beta1) |
114114
|----------------------------|--------------------|-------------------|-------------------|
115-
| Kubernetes v1.24 + etcd/v3 | ✓ (only workload) | | |
116-
| Kubernetes v1.25 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | |
117-
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) |
118-
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ (only workload) |
119-
| Kubernetes v1.28 + etcd/v3 | ✓ | ✓ | ✓ |
115+
| Kubernetes v1.24 + etcd/v3 | | | |
116+
| Kubernetes v1.25 + etcd/v3 | ✓ (only workload) | | |
117+
| Kubernetes v1.26 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | |
118+
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) |
119+
| Kubernetes v1.28 + etcd/v3 | ✓ | ✓ | ✓ (only workload) |
120120
| Kubernetes v1.29 + etcd/v3 | ✓ | ✓ | ✓ |
121-
| Kubernetes v1.30 + etcd/v3 | ✓ >= v1.7.1 | ✓ | ✓ |
122-
| Kubernetes v1.31 + etcd/v3 | | ✓ >= v1.8.1 | ✓ |
123-
| Kubernetes v1.32 + etcd/v3 | | | ✓ >= v1.9.1 |
121+
| Kubernetes v1.30 + etcd/v3 | ✓ | ✓ | ✓ |
122+
| Kubernetes v1.31 + etcd/v3 | ✓ >= v1.8.1 | ✓ | ✓ |
123+
| Kubernetes v1.32 + etcd/v3 | | ✓ >= v1.9.1 | ✓ |
124124

125125
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.
126126

0 commit comments

Comments
 (0)