Skip to content

Commit 439ed85

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#7194 from oscr/update-versions-doc
🌱 Update versions doc adding Kubernetes 1.25
2 parents b788b84 + d9821fd commit 439ed85

File tree

2 files changed

+38
-34
lines changed

2 files changed

+38
-34
lines changed

‎docs/book/src/developer/providers/version-migration.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ maintainers of other providers and consumers of the Go API in upgrading from one
66
- [v0.3 to v0.4](v0.3-to-v0.4.md)
77
- [v0.4 to v1.0](v0.4-to-v1.0.md)
88
- [v1.0 to v1.1](v1.0-to-v1.1.md)
9-
- [v1.1 to v1.2](v1.1-to-v1.2.md)
9+
- [v1.1 to v1.2](v1.1-to-v1.2.md)
10+
- [v1.2 to v1.3](v1.2-to-v1.3.md)

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

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,18 @@ 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 | | | | ✓ | ✓ | ✓ |
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 | | | | | ✓ | ✓ |
7778

7879
\* 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.
7980
Previous Kubernetes **minor** versions are not affected.
@@ -84,33 +85,35 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
8485

8586
#### Kubeadm Bootstrap Provider (`kubeadm-bootstrap-controller`)
8687

87-
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
88-
|-------------------------------------------------------------------|----------------------|----------------------|---------------------|----------------------|----------------------|--------------------|
89-
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | |
90-
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | |
91-
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
92-
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
93-
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
94-
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
95-
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
96-
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ |
97-
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ |
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 | | | | | ✓ | ✓ |
98100

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

101103
#### Kubeadm Control Plane Provider (`kubeadm-control-plane-controller`)
102104

103-
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
104-
|----------------------------|----------------------|----------------------|---------------------|--------------------|---------------------|---------------------|
105-
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | |
106-
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | |
107-
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
108-
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
109-
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
110-
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
111-
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
112-
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ |
113-
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ |
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 | | | | | ✓ | ✓ |
114117

115118
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.
116119

0 commit comments

Comments
 (0)