From 2b9ac169ddeb1dc1398ae3d25bf5bc523ee77bd4 Mon Sep 17 00:00:00 2001 From: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> Date: Mon, 3 Nov 2025 12:09:17 +0000 Subject: [PATCH 1/5] feat: Update book CAPI support and guarantee for v1.12 Signed-off-by: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> --- docs/book/src/reference/versions.md | 30 ++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index 895c47711582..a6c875ba938e 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -67,6 +67,7 @@ The table below documents support matrix for Cluster API versions (versions olde | Minor Release | Status | Supported Until (including maintenance mode) | |---------------|-------------------------|---------------------------------------------------------------------------------------------| +| v1.12.x | Under development | in maintenance mode when v1.14.0 will be released, EOL when v1.15.0 will be released | | v1.11.x | Standard support period | in maintenance mode when v1.13.0 will be released, EOL when v1.14.0 will be released | | v1.10.x | Standard support period | in maintenance mode when v1.12.0 will be released, EOL when v1.13.0 will be released | | v1.9.x | Maintenance mode | Maintenance mode since 2025-08-12 - v1.11.0 release date, EOL when v1.12.0 will be released | @@ -270,19 +271,21 @@ In some cases, also Cluster API and/or Cluster API providers are defining additi The following table defines the support matrix for the Cluster API core provider. See [Cluster API release support](#cluster-api-release-support) and [Kubernetes versions support](#kubernetes-versions-support). -| | v1.9, _Maintenance Mode_ | v1.10 | v1.11 | -|------------------|--------------------------|-------------------|-------------------| -| Kubernetes v1.24 | | | | -| Kubernetes v1.25 | | | | -| Kubernetes v1.26 | ✓ (only workload) | | | -| Kubernetes v1.27 | ✓ (only workload) | ✓ (only workload) | | -| Kubernetes v1.28 | ✓ | ✓ (only workload) | ✓ (only workload) | -| Kubernetes v1.29 | ✓ | ✓ | ✓ (only workload) | -| Kubernetes v1.30 | ✓ | ✓ | ✓ | -| Kubernetes v1.31 | ✓ | ✓ | ✓ | -| Kubernetes v1.32 | ✓ >= v1.9.1 | ✓ | ✓ | -| Kubernetes v1.33 | | ✓ >= v1.10.1 | ✓ | -| Kubernetes v1.34 | | | ✓ >= v1.11.1 | +| | v1.9, _Maintenance Mode_ | v1.10 | v1.11 | v1.12, _Under Development_ | +|------------------|--------------------------|-------------------|-------------------|------------------------------| +| Kubernetes v1.24 | | | | | +| Kubernetes v1.25 | | | | | +| Kubernetes v1.26 | ✓ (only workload) | | | | +| Kubernetes v1.27 | ✓ (only workload) | ✓ (only workload) | | | +| Kubernetes v1.28 | ✓ | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.29 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.30 | ✓ | ✓ | ✓ | ✓ (only workload) | +| Kubernetes v1.31 | ✓ | ✓ | ✓ | ✓ | +| Kubernetes v1.32 | ✓ >= v1.9.1 | ✓ | ✓ | ✓ | +| Kubernetes v1.33 | | ✓ >= v1.10.1 | ✓ | ✓ | +| Kubernetes v1.34 | | | ✓ >= v1.11.1 | ✓ | +| Kubernetes v1.35 (Under Development) | | | | ✓ >= v1.12.1 | + See also [Kubernetes version specific notes](#kubernetes-version-specific-notes). @@ -314,6 +317,7 @@ using the [kubeadm API](https://kubernetes.io/docs/setup/production-environment/ | Kubernetes v1.32 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) | | Kubernetes v1.33 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) | | Kubernetes v1.34 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) | +| Kubernetes v1.35 | [v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/) | ### Kubeadm Control Plane provider (`kubeadm-control-plane-controller`) From 73d4ef32c7674a6de5fe0030e5ab4b1f71b2b0e6 Mon Sep 17 00:00:00 2001 From: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> Date: Sun, 9 Nov 2025 12:14:31 +0000 Subject: [PATCH 2/5] fix: Update correct support timeline for v1.12, v1.11 and v1.10 Signed-off-by: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> --- docs/book/src/reference/versions.md | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index a6c875ba938e..fe2025ec39e7 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -67,10 +67,10 @@ The table below documents support matrix for Cluster API versions (versions olde | Minor Release | Status | Supported Until (including maintenance mode) | |---------------|-------------------------|---------------------------------------------------------------------------------------------| -| v1.12.x | Under development | in maintenance mode when v1.14.0 will be released, EOL when v1.15.0 will be released | +| v1.12.x | Standard support period | in maintenance mode when v1.14.0 will be released, EOL when v1.15.0 will be released | | v1.11.x | Standard support period | in maintenance mode when v1.13.0 will be released, EOL when v1.14.0 will be released | -| v1.10.x | Standard support period | in maintenance mode when v1.12.0 will be released, EOL when v1.13.0 will be released | -| v1.9.x | Maintenance mode | Maintenance mode since 2025-08-12 - v1.11.0 release date, EOL when v1.12.0 will be released | +| v1.10.x | Maintenance mode | Maintenance mode since 2025-12-18 - v1.12.0 release date,, EOL when v1.13.0 will be released | +| v1.9.x | EOL | EOL since 2025-12-18 - v1.12.0 release date | | v1.8.x | EOL | EOL since 2025-08-12 - v1.11.0 release date | | v1.7.x | EOL | EOL since 2025-04-22 - v1.10.0 release date | | v1.6.x | EOL | EOL since 2024-12-10 - v1.9.0 release date | @@ -271,20 +271,20 @@ In some cases, also Cluster API and/or Cluster API providers are defining additi The following table defines the support matrix for the Cluster API core provider. See [Cluster API release support](#cluster-api-release-support) and [Kubernetes versions support](#kubernetes-versions-support). -| | v1.9, _Maintenance Mode_ | v1.10 | v1.11 | v1.12, _Under Development_ | -|------------------|--------------------------|-------------------|-------------------|------------------------------| -| Kubernetes v1.24 | | | | | -| Kubernetes v1.25 | | | | | -| Kubernetes v1.26 | ✓ (only workload) | | | | -| Kubernetes v1.27 | ✓ (only workload) | ✓ (only workload) | | | -| Kubernetes v1.28 | ✓ | ✓ (only workload) | ✓ (only workload) | | -| Kubernetes v1.29 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) | -| Kubernetes v1.30 | ✓ | ✓ | ✓ | ✓ (only workload) | -| Kubernetes v1.31 | ✓ | ✓ | ✓ | ✓ | -| Kubernetes v1.32 | ✓ >= v1.9.1 | ✓ | ✓ | ✓ | -| Kubernetes v1.33 | | ✓ >= v1.10.1 | ✓ | ✓ | -| Kubernetes v1.34 | | | ✓ >= v1.11.1 | ✓ | -| Kubernetes v1.35 (Under Development) | | | | ✓ >= v1.12.1 | +| |v1.10, _Maintenance Mode_ | v1.11 | v1.12 | +|------------------|--------------------------|-------------------|------------------------------| +| Kubernetes v1.24 | | | | +| Kubernetes v1.25 | | | | +| Kubernetes v1.26 | | | | +| Kubernetes v1.27 | ✓ (only workload) | | | +| Kubernetes v1.28 | ✓ (only workload) | ✓ (only workload) | | +| Kubernetes v1.29 | ✓ | ✓ (only workload) | ✓ (only workload) | +| Kubernetes v1.30 | ✓ | ✓ | ✓ (only workload) | +| Kubernetes v1.31 | ✓ | ✓ | ✓ | +| Kubernetes v1.32 | ✓ | ✓ | ✓ | +| Kubernetes v1.33 | ✓ >= v1.10.1 | ✓ | ✓ | +| Kubernetes v1.34 | | ✓ >= v1.11.1 | ✓ | +| Kubernetes v1.35 | | | ✓ >= v1.12.1 | See also [Kubernetes version specific notes](#kubernetes-version-specific-notes). From 0e64fe7bbecf6c2221333ef274b975e8a8f1d9c6 Mon Sep 17 00:00:00 2001 From: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> Date: Sun, 9 Nov 2025 23:27:32 +1100 Subject: [PATCH 3/5] Update docs/book/src/reference/versions.md Co-authored-by: Fabrizio Pandini --- docs/book/src/reference/versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index fe2025ec39e7..c1ee237378da 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -69,7 +69,7 @@ The table below documents support matrix for Cluster API versions (versions olde |---------------|-------------------------|---------------------------------------------------------------------------------------------| | v1.12.x | Standard support period | in maintenance mode when v1.14.0 will be released, EOL when v1.15.0 will be released | | v1.11.x | Standard support period | in maintenance mode when v1.13.0 will be released, EOL when v1.14.0 will be released | -| v1.10.x | Maintenance mode | Maintenance mode since 2025-12-18 - v1.12.0 release date,, EOL when v1.13.0 will be released | +| v1.10.x | Maintenance mode | Maintenance mode since 2025-12-18 - v1.12.0 release date, EOL when v1.13.0 will be released | | v1.9.x | EOL | EOL since 2025-12-18 - v1.12.0 release date | | v1.8.x | EOL | EOL since 2025-08-12 - v1.11.0 release date | | v1.7.x | EOL | EOL since 2025-04-22 - v1.10.0 release date | From b0e9ea04cda70e0573afdfd828500e86b3c0821b Mon Sep 17 00:00:00 2001 From: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> Date: Sun, 9 Nov 2025 23:27:48 +1100 Subject: [PATCH 4/5] Update docs/book/src/reference/versions.md Co-authored-by: Fabrizio Pandini --- docs/book/src/reference/versions.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index c1ee237378da..c4ebada8e738 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -273,9 +273,6 @@ See [Cluster API release support](#cluster-api-release-support) and [Kubernetes | |v1.10, _Maintenance Mode_ | v1.11 | v1.12 | |------------------|--------------------------|-------------------|------------------------------| -| Kubernetes v1.24 | | | | -| Kubernetes v1.25 | | | | -| Kubernetes v1.26 | | | | | Kubernetes v1.27 | ✓ (only workload) | | | | Kubernetes v1.28 | ✓ (only workload) | ✓ (only workload) | | | Kubernetes v1.29 | ✓ | ✓ (only workload) | ✓ (only workload) | From 2ffcfd220036b175eb25a32244188b247ddb74d5 Mon Sep 17 00:00:00 2001 From: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> Date: Sun, 9 Nov 2025 12:30:58 +0000 Subject: [PATCH 5/5] fix: Remove Kubernetes v1.26-v1.24 for clean and correct docs Signed-off-by: Wendy Ha <139814343+wendy-ha18@users.noreply.github.com> --- docs/book/src/reference/versions.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md index c4ebada8e738..fe8df9081d5a 100644 --- a/docs/book/src/reference/versions.md +++ b/docs/book/src/reference/versions.md @@ -303,9 +303,6 @@ using the [kubeadm API](https://kubernetes.io/docs/setup/production-environment/ | | kubeadm API Version | |------------------|------------------------------------------------------------------------------------| -| Kubernetes v1.24 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) | -| Kubernetes v1.25 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) | -| Kubernetes v1.26 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) | | Kubernetes v1.27 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) | | Kubernetes v1.28 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) | | Kubernetes v1.29 | [v1beta3](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta3/) |