Skip to content

Commit d7229e5

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #9119 from g-gaston/update-versions-1-6
📖 Update CAPI support and guarantees for v1.6
2 parents dc57d8d + 4735113 commit d7229e5

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

‎CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,9 @@ Cluster API maintains the most recent release/releases for all supported API and
164164

165165
| Minor Release | API Version | Supported Until |
166166
|---------------|--------------|-----------------------------------------------------|
167-
| v1.4.x | **v1beta1** | when v1.6.0 will be released |
168-
| v1.3.x | **v1beta1** | when v1.5.0 will be released, tentatively July 2023 |
167+
| v1.5.x | **v1beta1** | when v1.7.0 will be released |
168+
| v1.4.x | **v1beta1** | when v1.6.0 will be released, tentatively Nov 2023 |
169+
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
169170
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
170171
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
171172
| v1.0.x | **v1beta1** | EOL since 2022-02-02 - v1.1.0 release date (*) |

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

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

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

75-
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
75+
| | v1.3 (v1beta1) (EOL) | v1.4 (v1beta1) | v1.5 (v1beta1) | v1.6 (v1beta1) |
7676
|-------------------|----------------------|-------------------|-------------------|-------------------|
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) | |
81-
| Kubernetes v1.22 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
82-
| Kubernetes v1.23* | ✓ | ✓ | ✓ | ✓ (only workload) |
77+
| Kubernetes v1.18 | ✓ (only workload) | | | |
78+
| Kubernetes v1.19 | ✓ (only workload) | | | |
79+
| Kubernetes v1.20 | ✓ | | | |
80+
| Kubernetes v1.21 | ✓ | ✓ (only workload) | | |
81+
| Kubernetes v1.22 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
82+
| Kubernetes v1.23* | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
8383
| Kubernetes v1.24 | ✓ | ✓ | ✓ | ✓ |
8484
| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ |
8585
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ |
86-
| Kubernetes v1.27 | | | ✓ | ✓ |
86+
| Kubernetes v1.27 | | ✓ | ✓ | ✓ |
8787

8888

8989
\* 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 +95,35 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
9595

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

98-
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
99-
|------------------------------------|----------------------|-------------------|--------------------|--------------------|
100-
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ (only workload) | ✓ (only workload) | | |
101-
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ (only workload) | ✓ (only workload) | | |
102-
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | | |
103-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ (only workload) | |
104-
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
105-
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
106-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
107-
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
108-
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
109-
| Kubernetes v1.27 + kubeadm/v1beta3 | | | ✓ | ✓ |
98+
| | v1.3 (v1beta1) (EOL) | v1.4 (v1beta1) | v1.5 (v1beta1) | v1.6 (v1beta1) |
99+
|------------------------------------|----------------------|--------------------|--------------------|--------------------|
100+
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ (only workload) | | | |
101+
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ (only workload) | | | |
102+
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | | | |
103+
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | | |
104+
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
105+
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
106+
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
107+
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
108+
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
109+
| Kubernetes v1.27 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ |
110110

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

113113
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
114114

115-
| | v1.2 (v1beta1) (EOL) | v1.3 (v1beta1) | v1.4 (v1beta1) | v1.5 (v1beta1) |
115+
| | v1.3 (v1beta1) (EOL) | v1.4 (v1beta1) | v1.5 (v1beta1) | v1.6 (v1beta1) |
116116
|----------------------------|----------------------|-------------------|-------------------|-------------------|
117-
| Kubernetes v1.18 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
118-
| Kubernetes v1.19 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
119-
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | | |
120-
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | |
121-
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
122-
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
117+
| Kubernetes v1.18 + etcd/v3 | ✓ (only workload) | | | |
118+
| Kubernetes v1.19 + etcd/v3 | ✓ (only workload) | | | |
119+
| Kubernetes v1.20 + etcd/v3 | ✓ | | | |
120+
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ (only workload) | | |
121+
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
122+
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
123123
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
124124
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
125125
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
126-
| Kubernetes v1.27 + etcd/v3 | | | ✓ | ✓ |
126+
| Kubernetes v1.27 + etcd/v3 | | ✓ | ✓ | ✓ |
127127

128128
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.
129129

@@ -135,12 +135,12 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
135135

136136
| CAPI Version | Max CoreDNS Version for Upgrade |
137137
|----------------------|---------------------------------|
138-
| v1.2 (v1beta1) | v1.9.3 |
139138
| >= v1.2.7 (v1beta1) | v1.10.0 |
140139
| >= v1.2.11 (v1beta1) | v1.10.1 |
141140
| v1.3 (v1beta1) | v1.10.0 |
142141
| >= v1.3.4 (v1beta1) | v1.10.1 |
143142
| v1.4 (v1beta1) | v1.10.1 |
143+
| v1.5 (v1beta1) | v1.10.1 |
144144

145145
#### Kubernetes version specific notes
146146

0 commit comments

Comments
 (0)