Skip to content

Commit

Permalink
Merge pull request #7194 from oscr/update-versions-doc
Browse files Browse the repository at this point in the history 
🌱 Update versions doc adding Kubernetes 1.25
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Sep 8, 2022
2 parents b788b84 + d9821fd commit 439ed85
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 34 deletions.
3 changes: 2 additions & 1 deletion docs/book/src/developer/providers/version-migration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ maintainers of other providers and consumers of the Go API in upgrading from one
- [v0.3 to v0.4](v0.3-to-v0.4.md)
- [v0.4 to v1.0](v0.4-to-v1.0.md)
- [v1.0 to v1.1](v1.0-to-v1.1.md)
- [v1.1 to v1.2](v1.1-to-v1.2.md)
- [v1.1 to v1.2](v1.1-to-v1.2.md)
- [v1.2 to v1.3](v1.2-to-v1.3.md)
69 changes: 36 additions & 33 deletions docs/book/src/reference/versions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,18 @@ These diagrams show the relationships between components in a Cluster API releas

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

| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|-------------------|----------------------|----------------------|---------------------|--------------------|----------------------|---------------------|
| Kubernetes v1.16 | ✓ | | | | | |
| Kubernetes v1.17 | ✓ | | | | | |
| Kubernetes v1.18 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23* | | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.24 | | | | ✓ | ✓ | ✓ |
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|-------------------|----------------------|----------------------|---------------------|-------------------|----------------------|---------------------|
| Kubernetes v1.16 | ✓ | | | | | |
| Kubernetes v1.17 | ✓ | | | | | |
| Kubernetes v1.18 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23* | | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.24 | | | | ✓ | ✓ | ✓ |
| Kubernetes v1.25 | | | | | ✓ | ✓ |

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

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

| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|-------------------------------------------------------------------|----------------------|----------------------|---------------------|----------------------|----------------------|--------------------|
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | |
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | |
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ |
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|-------------------------------------------------------------------|----------------------|----------------------|---------------------|-------------------|----------------------|--------------------|
| Kubernetes v1.16 + kubeadm/v1beta2 | ✓ | | | | | |
| Kubernetes v1.17 + kubeadm/v1beta2 | ✓ | | | | | |
| Kubernetes v1.18 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 + kubeadm/v1beta2 (v0.3) kubeadm/v1beta3 (v0.4+) | ✓ (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.24 + kubeadm/v1beta3 | | | | ✓ | ✓ | ✓ |
| Kubernetes v1.25 + kubeadm/v1beta3 | | | | | ✓ | ✓ |

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

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

| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|----------------------------|----------------------|----------------------|---------------------|--------------------|---------------------|---------------------|
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | |
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | |
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ |
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ |
| | v0.3 (v1alpha3) | v0.4 (v1alpha4) | v1.0 (v1beta1) | v1.1 (v1beta1) | v1.2 (v1beta1) | v1.3 (v1beta1) |
|----------------------------|----------------------|----------------------|---------------------|-------------------|---------------------|---------------------|
| Kubernetes v1.16 + etcd/v3 | ✓ | | | | | |
| Kubernetes v1.17 + etcd/v3 | ✓ | | | | | |
| Kubernetes v1.18 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.19 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.20 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.22 + etcd/v3 | ✓* (only workload) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.23 + etcd/v3 | | ✓* | ✓* | ✓ | ✓ | ✓ |
| Kubernetes v1.24 + etcd/v3 | | | | ✓ | ✓ | ✓ |
| Kubernetes v1.25 + etcd/v3 | | | | | ✓ | ✓ |

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.

Expand Down

0 comments on commit 439ed85

Please sign in to comment.