Skip to content

Commit

Permalink
Merge pull request #10535 from sbueringer/pr-cp-support
Browse files Browse the repository at this point in the history 
📖 Drop v1.4 column, set v1.5 to EOL in versions.md
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Apr 29, 2024
2 parents 42259d1 + cc82120 commit c8d0101
Showing 1 changed file with 33 additions and 37 deletions.
70 changes: 33 additions & 37 deletions docs/book/src/reference/versions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,17 @@ These diagrams show the relationships between components in a Cluster API releas

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

| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|-------------------|----------------------|-------------------|-------------------|-------------------|
| Kubernetes v1.21 | ✓ (only workload) | | | |
| Kubernetes v1.22 | ✓ (only workload) | ✓ (only workload) | | |
| Kubernetes v1.23* | ✓ | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.27 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 | | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 | | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 | | | | ✓ >= v1.7.1 |

| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|-------------------|----------------------|-------------------|-------------------|
| Kubernetes v1.22 | ✓ (only workload) | | |
| Kubernetes v1.23* | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 | ✓ | ✓ | ✓ |
| Kubernetes v1.27 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 | | | ✓ >= v1.7.1 |

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

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

| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|------------------------------------|----------------------|--------------------|--------------------|--------------------|
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ (only workload) | | | |
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | |
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 + kubeadm/v1beta3 | | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 + kubeadm/v1beta3 | | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 + kubeadm/v1beta3 | | | | ✓ >= v1.7.1 |
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|------------------------------------|----------------------|--------------------|--------------------|
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | | |
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 + kubeadm/v1beta3 | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 + kubeadm/v1beta3 | | | ✓ >= v1.7.1 |

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`)

| | v1.4 (v1beta1) (EOL) | v1.5 (v1beta1) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|----------------------------|----------------------|-------------------|-------------------|-------------------|
| Kubernetes v1.21 + etcd/v3 | ✓ (only workload) | | | |
| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
| Kubernetes v1.27 + etcd/v3 | ✓ >= v1.4.2 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 + etcd/v3 | | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 + etcd/v3 | | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 + etcd/v3 | | | | ✓ >= v1.7.1 |
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) |
|----------------------------|----------------------|-------------------|-------------------|
| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | | |
| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | |
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) |
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ (only workload) |
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ |
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ |
| Kubernetes v1.28 + etcd/v3 | ✓ >= v1.5.1 | ✓ | ✓ |
| Kubernetes v1.29 + etcd/v3 | | ✓ >= v1.6.1 | ✓ |
| Kubernetes v1.30 + etcd/v3 | | | ✓ >= v1.7.1 |

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 c8d0101

Please sign in to comment.