Skip to content

Commit 1da245a

Browse files
committed
Update versions doc adding Kubernetes 1.26
Signed-off-by: Aniruddha Basak <[email protected]>
1 parent bfe4604 commit 1da245a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

docs/book/src/reference/versions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ All Infrastructure Providers are maintained by independent teams. Other Bootstra
1515

1616
## Supported Kubernetes Versions
1717

18-
The project aims to keep the current minor release compatible with the actively supported Kubernetes minor releases, i.e.,
18+
The project aims to keep the current minor release compatible with the actively supported Kubernetes minor releases, i.e.,
1919
the current release (N), N-1, and N-2. Where possible we will go above and beyond this trying to help our users support
2020
both newer and older versions of Kubernetes:
2121

22-
- For a given Cluster API minor release, we give best-effort support for future Kubernetes versions that are released
22+
- For a given Cluster API minor release, we give best-effort support for future Kubernetes versions that are released
2323
during the release's active support period. Depending on the changes made in Kubernetes, users may be required to
2424
update to the next patch release of Cluster API to maintain compatibility.
2525
- In some cases where support for future Kubernetes versions can't be added, or is considered not practical or too risky
2626
adding it, the Kubernetes version support matrix for an existing Cluster API minor release will stop at the last supported version.
2727
- Cluster API offers best-effort support for older Kubernetes versions where possible.
28-
Important! this is not a replacement/alternative for upstream Kubernetes support policies!
28+
Important! this is not a replacement/alternative for upstream Kubernetes support policies!
2929
Support for older version of Kubernetes is limited to "Cluster API can start a Cluster with this Kubernetes version"
3030
and "Cluster API can upgrade to the next Kubernetes version"; it does not include any extended support to Kubernetes itself.
3131

3232
Whenever a new Cluster API release is cut, we will document the Kubernetes version compatibility matrix the release
3333
has been tested with. Summaries of Kubernetes versions supported by each component are additionally maintained in
3434
the [tables](#release-components) below.
3535

36-
On a final comment, let's praise all the contributors keeping care of such a wide support matrix.
36+
On a final comment, let's praise all the contributors keeping care of such a wide support matrix.
3737
If someone is looking for opportunities to help with the project, this is definitely an area where additional hands
3838
and eyes will be more than welcome and greatly beneficial to the entire community.
3939

@@ -75,7 +75,7 @@ These diagrams show the relationships between components in a Cluster API releas
7575
| Kubernetes v1.23* | |||||||
7676
| Kubernetes v1.24 | | | |||||
7777
| Kubernetes v1.25 | | | | ||||
78-
| Kubernetes v1.26 | | | | | | | |
78+
| Kubernetes v1.26 | | | | | | | |
7979

8080

8181
\* 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.
@@ -99,7 +99,7 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
9999
| Kubernetes v1.23 + kubeadm/v1beta3 | |||||||
100100
| Kubernetes v1.24 + kubeadm/v1beta3 | | | |||||
101101
| Kubernetes v1.25 + kubeadm/v1beta3 | | | | ||||
102-
| Kubernetes v1.26 + kubeadm/v1beta3 | | | | | | | |
102+
| Kubernetes v1.26 + kubeadm/v1beta3 | | | | | | | |
103103

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

@@ -117,7 +117,7 @@ The Kubeadm Bootstrap Provider generates kubeadm configuration using the API ver
117117
| Kubernetes v1.23 + etcd/v3 | |* |* |||||
118118
| Kubernetes v1.24 + etcd/v3 | | | |||||
119119
| Kubernetes v1.25 + etcd/v3 | | | | ||||
120-
| Kubernetes v1.26 + etcd/v3 | | | | | | | |
120+
| Kubernetes v1.26 + etcd/v3 | | | | | | | |
121121

122122
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.
123123

0 commit comments

Comments
 (0)