Skip to content

Commit 04afe09

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8168 from sbueringer/pr-cleanup-versions
📖 book: remove old versions from versions.md
2 parents 87b19f5 + ffae065 commit 04afe09

File tree

1 file changed

+34
-43
lines changed

1 file changed

+34
-43
lines changed

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

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Supported Versions
44

5-
The Cluster API team maintains branches for **v1.x (v1beta1)** **v0.4 (v1alpha4)** and **v0.3 (v1alpha3)**, the most recent releases.
5+
The Cluster API team maintains branches for **v1.x (v1beta1)**. For more details see [Support and guarantees](https://github.com/kubernetes-sigs/cluster-api/blob/main/CONTRIBUTING.md#support-and-guarantees).
66

77
Releases include these components:
88

@@ -72,19 +72,17 @@ These diagrams show the relationships between components in a Cluster API releas
7272

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

75-
| | v0.3 (v1alpha3) (EOL) | v0.4 (v1alpha4) (EOL) | v1.0 (v1beta1) (EOL) | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
76-
|-------------------|-----------------------|-----------------------|----------------------|----------------------|-------------------|-------------------|-------------------|
77-
| Kubernetes v1.16 | ✓ | | | | | | |
78-
| Kubernetes v1.17 | ✓ | | | | | | |
79-
| Kubernetes v1.18 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
80-
| Kubernetes v1.19 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | |
81-
| Kubernetes v1.20 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
82-
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
83-
| Kubernetes v1.22 | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
84-
| Kubernetes v1.23* | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
85-
| Kubernetes v1.24 | | | | ✓ | ✓ | ✓ | ✓ |
86-
| Kubernetes v1.25 | | | | | ✓ | ✓ | ✓ |
87-
| Kubernetes v1.26 | | | | | ✓ | ✓ | ✓ |
75+
| | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
76+
|-------------------|----------------------|-------------------|-------------------|-------------------|
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) |
82+
| Kubernetes v1.23* | ✓ | ✓ | ✓ | ✓ |
83+
| Kubernetes v1.24 | ✓ | ✓ | ✓ | ✓ |
84+
| Kubernetes v1.25 | | ✓ | ✓ | ✓ |
85+
| Kubernetes v1.26 | | ✓ | ✓ | ✓ |
8886

8987

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

9795
#### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`)
9896

99-
| | v0.3 (v1alpha3) (EOL) | v0.4 (v1alpha4) (EOL) | v1.0 (v1beta1) (EOL) | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
100-
|-------------------------------------------------------------------|-----------------------|-----------------------|----------------------|----------------------|-------------------|-------------------|--------------------|
101-
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | | |
102-
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | | |
103-
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
104-
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | |
105-
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
106-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
107-
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
108-
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
109-
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ | ✓ |
110-
| Kubernetes v1.25 + kubeadm/v1beta3 | | | | | ✓ | ✓ | ✓ |
111-
| Kubernetes v1.26 + kubeadm/v1beta3 | | | | | ✓ | ✓ | ✓ |
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 | | ✓ | ✓ | ✓ |
112108

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

115111
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
116112

117-
| | v0.3 (v1alpha3) (EOL) | v0.4 (v1alpha4) (EOL) | v1.0 (v1beta1) (EOL) | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
118-
|----------------------------|-----------------------|-----------------------|----------------------|----------------------|-------------------|-------------------|-------------------|
119-
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | | |
120-
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | | |
121-
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | |
122-
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | |
123-
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
124-
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
125-
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) |
126-
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ | ✓ |
127-
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ | ✓ |
128-
| Kubernetes v1.25 + etcd/v3 | | | | | ✓ | ✓ | ✓ |
129-
| Kubernetes v1.26 + etcd/v3 | | | | | ✓ | ✓ | ✓ |
113+
| | v1.1 (v1beta1) (EOL) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
114+
|----------------------------|----------------------|-------------------|-------------------|-------------------|
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) |
120+
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
121+
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
122+
| Kubernetes v1.25 + etcd/v3 | | ✓ | ✓ | ✓ |
123+
| Kubernetes v1.26 + etcd/v3 | | ✓ | ✓ | ✓ |
130124

131125
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.
132126

@@ -138,9 +132,6 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
138132

139133
| CAPI Version | Max CoreDNS Version for Upgrade |
140134
|----------------------|---------------------------------|
141-
| v0.3 (v1alpha3) | v1.8.4 |
142-
| v0.4 (v1alpha4) | v1.8.4 |
143-
| v1.0 (v1beta1) | v1.8.5 |
144135
| v1.1 (v1beta1) | v1.9.3 |
145136
| v1.2 (v1beta1) | v1.9.3 |
146137
| >= v1.2.7 (v1beta1) | v1.10.0 |

0 commit comments

Comments
 (0)