Skip to content

Commit df74799

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8308 from oscr/update-version-support
📖 docs: update CAPI support and guarantees
2 parents 022c70b + fc8b07c commit df74799

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

‎CONTRIBUTING.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,15 @@ Cluster API maintains the most recent release/releases for all supported API and
152152
- 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.
153153
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.
154154

155-
| Minor Release | API Version | Supported Until |
156-
|---------------|--------------|------------------------------------------------------|
157-
| v1.3.x | **v1beta1** | when v1.5.0 will be released |
158-
| v1.2.x | **v1beta1** | when v1.4.0 will be released, tentatively March 2023 |
159-
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
160-
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
161-
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
162-
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
155+
| Minor Release | API Version | Supported Until |
156+
|---------------|--------------|-----------------------------------------------------|
157+
| v1.4.x | **v1beta1** | when v1.6.0 will be released |
158+
| v1.3.x | **v1beta1** | when v1.5.0 will be released, tentatively July 2023 |
159+
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
160+
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
161+
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |
162+
| v0.4.x | **v1alpha4** | EOL since 2022-04-06 - API version EOL |
163+
| v0.3.x | **v1alpha3** | EOL since 2022-02-23 - API version EOL |
163164

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

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

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ These diagrams show the relationships between components in a Cluster API releas
7272

7373
#### Core Provider (`cluster-api-controller`)
7474

75-
| | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
75+
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
7676
|-------------------|----------------------|-------------------|-------------------|-------------------|
77-
| Kubernetes v1.18 | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
78-
| Kubernetes v1.19 | ✓ | ✓ (only workload) | ✓ (only workload) | |
79-
| Kubernetes v1.20 | ✓ | ✓ | ✓ | |
80-
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ (only workload) |
81-
| Kubernetes v1.22 | ✓ | ✓ | ✓ | ✓ (only workload) |
77+
| Kubernetes v1.18 | ✓ (only workload) | ✓ (only workload) | | |
78+
| Kubernetes v1.19 | ✓ (only workload) | ✓ (only workload) | | |
79+
| Kubernetes v1.20 | ✓ | ✓ | | |
80+
| Kubernetes v1.21 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
81+
| Kubernetes v1.22 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
8282
| Kubernetes v1.23* | ✓ | ✓ | ✓ | ✓ |
8383
| Kubernetes v1.24 | ✓ | ✓ | ✓ | ✓ |
84-
| Kubernetes v1.25 | | ✓ | ✓ | ✓ |
85-
| Kubernetes v1.26 | | ✓ | ✓ | ✓ |
84+
| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ |
85+
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ |
8686

8787

8888
\* 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.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
98-
|------------------------------------|----------------------|-------------------|-------------------|--------------------|
99-
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
100-
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | |
101-
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | |
102-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ (only workload) |
103-
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
104-
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
105-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
106-
| Kubernetes v1.25 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ |
107-
| Kubernetes v1.26 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ |
97+
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
98+
|------------------------------------|----------------------|-------------------|--------------------|--------------------|
99+
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ (only workload) | ✓ (only workload) | | |
100+
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ (only workload) | ✓ (only workload) | | |
101+
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | | |
102+
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
103+
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
104+
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
105+
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
106+
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
107+
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
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.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
113+
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
114114
|----------------------------|----------------------|-------------------|-------------------|-------------------|
115-
| Kubernetes v1.18 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
116-
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
117-
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | |
118-
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
119-
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
115+
| Kubernetes v1.18 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
116+
| Kubernetes v1.19 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
117+
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | | |
118+
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
119+
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
120120
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
121121
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
122-
| Kubernetes v1.25 + etcd/v3 | | ✓ | ✓ | ✓ |
123-
| Kubernetes v1.26 + etcd/v3 | | ✓ | ✓ | ✓ |
122+
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
123+
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
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

@@ -132,7 +132,6 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
132132

133133
| CAPI Version | Max CoreDNS Version for Upgrade |
134134
|----------------------|---------------------------------|
135-
| v1.1 (v1beta1) | v1.9.3 |
136135
| v1.2 (v1beta1) | v1.9.3 |
137136
| >= v1.2.7 (v1beta1) | v1.10.0 |
138137
| >= v1.2.11 (v1beta1) | v1.10.1 |

0 commit comments

Comments
 (0)