Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#11163 from chandankumar4/update-ve…
Browse files Browse the repository at this point in the history
…rsion-1.9

📖 Update CAPI support and guarantees for v1.9
  • Loading branch information
k8s-ci-robot committed Sep 11, 2024
2 parents a08e4b4 + 6301d7b commit f9738ac
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ Cluster API maintains the most recent release/releases for all supported API and

| Minor Release | API Version | Supported Until |
|---------------|--------------|------------------------------------------------|
| v1.9.x | **v1beta1** | when v1.11.0 will be released |
| v1.8.x | **v1beta1** | when v1.10.0 will be released |
| v1.7.x | **v1beta1** | when v1.9.0 will be released |
| v1.6.x | **v1beta1** | EOL since 2024-08-12 - v1.8.0 release date |
Expand Down
66 changes: 33 additions & 33 deletions docs/book/src/reference/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,18 @@ These diagrams show the relationships between components in a Cluster API releas

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

| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (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) | ✓ (only workload) |
| Kubernetes v1.26 ||| | ✓ (only workload) |
| Kubernetes v1.27 |||| |
| Kubernetes v1.28 |>= v1.5.1 ||||
| Kubernetes v1.29 | | ✓ >= v1.6.1 |||
| Kubernetes v1.30 | | | ✓ >= v1.7.1 ||
| Kubernetes v1.31 | | | | ✓ >= v1.8.1 |
| Kubernetes v1.22 | | | | |
| Kubernetes v1.23* | ✓ (only workload) | | | |
| Kubernetes v1.24 |(only workload) | ✓ (only workload) | | |
| Kubernetes v1.25 ||(only workload) | ✓ (only workload) | |
| Kubernetes v1.26 |||(only workload) | ✓ (only workload) |
| Kubernetes v1.27 ||||(only workload) |
| Kubernetes v1.28 | ||||
| Kubernetes v1.29 | ✓ >= v1.6.1 | |||
| Kubernetes v1.30 | | ✓ >= v1.7.1 | ||
| Kubernetes v1.31 | | | ✓ >= v1.8.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.
Expand All @@ -95,35 +95,35 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,

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

| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (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) | ✓ (only workload) |
| Kubernetes v1.26 + kubeadm/v1beta3 ||| | ✓ (only workload) |
| 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 ||
| Kubernetes v1.31 + kubeadm/v1beta4 | | | | ✓ >= v1.8.1 |
| Kubernetes v1.22 + kubeadm/v1beta3 | | | | |
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | | | |
| Kubernetes v1.24 + kubeadm/v1beta3 |(only workload) | ✓ (only workload) | | |
| Kubernetes v1.25 + kubeadm/v1beta3 ||(only workload) | ✓ (only workload) | |
| Kubernetes v1.26 + kubeadm/v1beta3 |||(only workload) | ✓ (only workload) |
| Kubernetes v1.27 + kubeadm/v1beta3 ||||(only workload) |
| Kubernetes v1.28 + kubeadm/v1beta3 | ||||
| Kubernetes v1.29 + kubeadm/v1beta3 | ✓ >= v1.6.1 | |||
| Kubernetes v1.30 + kubeadm/v1beta3 | | ✓ >= v1.7.1 | ||
| Kubernetes v1.31 + kubeadm/v1beta4 | | | ✓ >= v1.8.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.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (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) | ✓ (only workload) |
| Kubernetes v1.26 + etcd/v3 ||| | ✓ (only workload) |
| 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 ||
| Kubernetes v1.31 + etcd/v3 | | | | ✓ >= v1.8.1 |
| Kubernetes v1.22 + etcd/v3 | | | | |
| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | | | |
| Kubernetes v1.24 + etcd/v3 |(only workload) | ✓ (only workload) | | |
| Kubernetes v1.25 + etcd/v3 ||(only workload) | ✓ (only workload) | |
| Kubernetes v1.26 + etcd/v3 |||(only workload) | ✓ (only workload) |
| Kubernetes v1.27 + etcd/v3 ||||(only workload) |
| Kubernetes v1.28 + etcd/v3 | ||||
| Kubernetes v1.29 + etcd/v3 | ✓ >= v1.6.1 | |||
| Kubernetes v1.30 + etcd/v3 | | ✓ >= v1.7.1 | ||
| Kubernetes v1.31 + etcd/v3 | | | ✓ >= v1.8.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 f9738ac

Please sign in to comment.