Skip to content

Commit f9738ac

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11163 from chandankumar4/update-version-1.9
📖 Update CAPI support and guarantees for v1.9
2 parents a08e4b4 + 6301d7b commit f9738ac

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

‎CONTRIBUTING.md

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ Cluster API maintains the most recent release/releases for all supported API and
140140

141141
| Minor Release | API Version | Supported Until |
142142
|---------------|--------------|------------------------------------------------|
143+
| v1.9.x | **v1beta1** | when v1.11.0 will be released |
143144
| v1.8.x | **v1beta1** | when v1.10.0 will be released |
144145
| v1.7.x | **v1beta1** | when v1.9.0 will be released |
145146
| v1.6.x | **v1beta1** | EOL since 2024-08-12 - v1.8.0 release date |

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

+33-33
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ These diagrams show the relationships between components in a Cluster API releas
7474

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

77-
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
77+
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (v1beta1) |
7878
|-------------------|----------------------|-------------------|-------------------|-------------------|
79-
| Kubernetes v1.22 | ✓ (only workload) | | | |
80-
| Kubernetes v1.23* | ✓ (only workload) | ✓ (only workload) | | |
81-
| Kubernetes v1.24 | ✓ | ✓ (only workload) | ✓ (only workload) | |
82-
| Kubernetes v1.25 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
83-
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ (only workload) |
84-
| Kubernetes v1.27 | ✓ | ✓ | ✓ | ✓ |
85-
| Kubernetes v1.28 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
86-
| Kubernetes v1.29 | | ✓ >= v1.6.1 | ✓ | ✓ |
87-
| Kubernetes v1.30 | | | ✓ >= v1.7.1 | ✓ |
88-
| Kubernetes v1.31 | | | | ✓ >= v1.8.1 |
79+
| Kubernetes v1.22 | | | | |
80+
| Kubernetes v1.23* | ✓ (only workload) | | | |
81+
| Kubernetes v1.24 | ✓ (only workload) | ✓ (only workload) | | |
82+
| Kubernetes v1.25 | ✓ | ✓ (only workload) | ✓ (only workload) | |
83+
| Kubernetes v1.26 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
84+
| Kubernetes v1.27 | ✓ | ✓ | ✓ | ✓ (only workload) |
85+
| Kubernetes v1.28 | ✓ | ✓ | ✓ | ✓ |
86+
| Kubernetes v1.29 | ✓ >= v1.6.1 | ✓ | ✓ | ✓ |
87+
| Kubernetes v1.30 | | ✓ >= v1.7.1 | ✓ | ✓ |
88+
| Kubernetes v1.31 | | | ✓ >= v1.8.1 | ✓ |
8989

9090

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

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

98-
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
98+
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (v1beta1) |
9999
|------------------------------------|----------------------|--------------------|--------------------|--------------------|
100-
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ (only workload) | | | |
101-
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | |
102-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
103-
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
104-
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
105-
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
106-
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
107-
| Kubernetes v1.29 + kubeadm/v1beta3 | | ✓ >= v1.6.1 | ✓ | ✓ |
108-
| Kubernetes v1.30 + kubeadm/v1beta3 | | | ✓ >= v1.7.1 | ✓ |
109-
| Kubernetes v1.31 + kubeadm/v1beta4 | | | | ✓ >= v1.8.1 |
100+
| Kubernetes v1.22 + kubeadm/v1beta3 | | | | |
101+
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ (only workload) | | | |
102+
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ (only workload) | ✓ (only workload) | | |
103+
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
104+
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
105+
| Kubernetes v1.27 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
106+
| Kubernetes v1.28 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
107+
| Kubernetes v1.29 + kubeadm/v1beta3 | ✓ >= v1.6.1 | ✓ | ✓ | ✓ |
108+
| Kubernetes v1.30 + kubeadm/v1beta3 | | ✓ >= v1.7.1 | ✓ | ✓ |
109+
| Kubernetes v1.31 + kubeadm/v1beta4 | | | ✓ >= v1.8.1 | ✓ |
110110

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

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

115-
| | v1.5 (v1beta1) (EOL) | v1.6 (v1beta1) | v1.7 (v1beta1) | v1.8 (v1beta1) |
115+
| | v1.6 (v1beta1) (EOL) | v1.7 (v1beta1) | v1.8 (v1beta1) | v1.9 (v1beta1) |
116116
|----------------------------|----------------------|-------------------|-------------------|-------------------|
117-
| Kubernetes v1.22 + etcd/v3 | ✓ (only workload) | | | |
118-
| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
119-
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
120-
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
121-
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
122-
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
123-
| Kubernetes v1.28 + etcd/v3 | ✓ >= v1.5.1 | ✓ | ✓ | ✓ |
124-
| Kubernetes v1.29 + etcd/v3 | | ✓ >= v1.6.1 | ✓ | ✓ |
125-
| Kubernetes v1.30 + etcd/v3 | | | ✓ >= v1.7.1 | ✓ |
126-
| Kubernetes v1.31 + etcd/v3 | | | | ✓ >= v1.8.1 |
117+
| Kubernetes v1.22 + etcd/v3 | | | | |
118+
| Kubernetes v1.23 + etcd/v3 | ✓ (only workload) | | | |
119+
| Kubernetes v1.24 + etcd/v3 | ✓ (only workload) | ✓ (only workload) | | |
120+
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
121+
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
122+
| Kubernetes v1.27 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
123+
| Kubernetes v1.28 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
124+
| Kubernetes v1.29 + etcd/v3 | ✓ >= v1.6.1 | ✓ | ✓ | ✓ |
125+
| Kubernetes v1.30 + etcd/v3 | | ✓ >= v1.7.1 | ✓ | ✓ |
126+
| Kubernetes v1.31 + etcd/v3 | | | ✓ >= v1.8.1 | ✓ |
127127

128128
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.
129129

0 commit comments

Comments
 (0)