Skip to content

Commit 92ebe7d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #7696 from oscr/update-versions
📖 docs: add Cluster API 1.4 and Kubernetes 1.26 to supported versions page
2 parents f73b00d + b806848 commit 92ebe7d

File tree

1 file changed

+48
-39
lines changed

1 file changed

+48
-39
lines changed

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

Lines changed: 48 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,20 @@ These diagrams show the relationships between components in a Cluster API releas
6363

6464
#### Core Provider (`cluster-api-controller`)
6565

66-
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
67-
|-------------------|----------------------|----------------------|---------------------|-------------------|----------------------|---------------------|
68-
| Kubernetes v1.16 | ✓ | | | | | |
69-
| Kubernetes v1.17 | ✓ | | | | | |
70-
| Kubernetes v1.18 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
71-
| Kubernetes v1.19 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
72-
| Kubernetes v1.20 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
73-
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
74-
| Kubernetes v1.22 | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
75-
| Kubernetes v1.23* | | ✓ | ✓ | ✓ | ✓ | ✓ |
76-
| Kubernetes v1.24 | | | | ✓ | ✓ | ✓ |
77-
| Kubernetes v1.25 | | | | | ✓ | ✓ |
66+
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
67+
|-------------------|----------------------|-------------------|-------------------|-------------------|-------------------|-------------------|-------------------|
68+
| Kubernetes v1.16 | ✓ | | | | | | |
69+
| Kubernetes v1.17 | ✓ | | | | | | |
70+
| Kubernetes v1.18 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
71+
| Kubernetes v1.19 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
72+
| Kubernetes v1.20 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
73+
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
74+
| Kubernetes v1.22 | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
75+
| Kubernetes v1.23* | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
76+
| Kubernetes v1.24 | | | | ✓ | ✓ | ✓ | ✓ |
77+
| Kubernetes v1.25 | | | | | ✓ | ✓ | ✓ |
78+
| Kubernetes v1.26 | | | | | | | |
79+
7880

7981
\* 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.
8082
Previous Kubernetes **minor** versions are not affected.
@@ -85,35 +87,37 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
8587

8688
#### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`)
8789

88-
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
89-
|-------------------------------------------------------------------|----------------------|----------------------|---------------------|-------------------|----------------------|--------------------|
90-
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | |
91-
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | |
92-
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
93-
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
94-
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
95-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
96-
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
97-
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ |
98-
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ |
99-
| Kubernetes v1.25 + kubeadm/v1beta3 | | | | | ✓ | ✓ |
90+
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
91+
|--------------------------------------------------------------------|----------------------|----------------------|---------------------|-------------------|-------------------|-------------------|-------------------|
92+
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | | |
93+
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | | |
94+
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
95+
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
96+
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
97+
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
98+
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
99+
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
100+
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ | ✓ |
101+
| Kubernetes v1.25 + kubeadm/v1beta3 | | | | | ✓ | ✓ | ✓ |
102+
| Kubernetes v1.26 + kubeadm/v1beta3 | | | | | | | |
100103

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

103106
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
104107

105-
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
106-
|----------------------------|----------------------|----------------------|---------------------|-------------------|---------------------|---------------------|
107-
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | |
108-
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | |
109-
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
110-
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
111-
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
112-
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
113-
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
114-
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ |
115-
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ |
116-
| Kubernetes v1.25 + etcd/v3 | | | | | ✓ | ✓ |
108+
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) | v1.4 (v1beta1) |
109+
|----------------------------|----------------------|----------------------|---------------------|-------------------|-------------------|-------------------|-------------------|
110+
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | | |
111+
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | | |
112+
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
113+
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
114+
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
115+
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
116+
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
117+
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ | ✓ |
118+
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ | ✓ |
119+
| Kubernetes v1.25 + etcd/v3 | | | | | ✓ | ✓ | ✓ |
120+
| Kubernetes v1.26 + etcd/v3 | | | | | | | |
117121

118122
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.
119123

@@ -131,11 +135,17 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
131135
| v1.1 (v1beta1) | v1.9.3 |
132136
| v1.2 (v1beta1) | v1.9.3 (v1.10.0 with >= v1.2.7) |
133137
| v1.3 (v1beta1) | v1.10.0 |
138+
| v1.4 (v1beta1) | v1.10.0 |
134139

135140
#### Kubernetes version specific notes
136141

137-
**1.24**:
142+
**1.26**:
143+
* No specific notes
138144

145+
**1.25**:
146+
* No specific notes
147+
148+
**1.24**:
139149
* Kubeadm Bootstrap Provider:
140150
* `kubeadm` now sets both the `node-role.kubernetes.io/control-plane` and `node-role.kubernetes.io/master` taints on control plane nodes.
141151
* `kubeadm` now only sets the `node-role.kubernetes.io/control-plane` label on control plane nodes (the `node-role.kubernetes.io/master` label is not set anymore).
@@ -144,8 +154,7 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
144154

145155
#### clusterctl
146156

147-
It is strongly recommended to always use the latest version of [clusterctl](../clusterctl/overview.md), in order to
148-
get all the fixes/latest changes.
157+
It is strongly recommended to always use the latest version of [clusterctl](../clusterctl/overview.md), in order to get all the fixes/latest changes.
149158

150159
In case of upgrades, clusterctl should be upgraded first and then used to upgrade all the other components.
151160

0 commit comments

Comments
 (0)