Skip to content

Commit 1632b9e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#9161 from chrischdi/pr-1-28-book-versions
📖 book: Update versions doc adding Kubernetes 1.28 + prowjob documentation
2 parents 728b1b3 + ef98759 commit 1632b9e

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

‎docs/book/src/developer/providers/version-migration.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ maintainers of other providers and consumers of the Go API in upgrading from one
99
- [v1.1 to v1.2](migrations/v1.1-to-v1.2.md)
1010
- [v1.2 to v1.3](migrations/v1.2-to-v1.3.md)
1111
- [v1.3 to v1.4](migrations/v1.3-to-v1.4.md)
12-
- [v1.4 to v1.5](migrations/v1.4-to-v1.5.md)
12+
- [v1.4 to v1.5](migrations/v1.4-to-v1.5.md)
13+
- [v1.5 to v1.6](migrations/v1.5-to-v1.6.md)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Prow Presubmits:
3232
* GINKGO_SKIP: `[PR-Blocking] [Conformance] [K8s-Upgrade]`
3333
* [pull-cluster-api-e2e-full-main] `./scripts/ci-e2e.sh`
3434
* GINKGO_SKIP: `[PR-Blocking] [Conformance] [K8s-Upgrade]|[IPv6]`
35-
* [pull-cluster-api-e2e-workload-upgrade-1-27-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.27` TO: `ci/latest-1.28`
35+
* [pull-cluster-api-e2e-workload-upgrade-1-28-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.28` TO: `ci/latest-1.29`
3636
* GINKGO_FOCUS: `[K8s-Upgrade]`
3737
* [pull-cluster-api-e2e-scale-main-experimental] `./scripts/ci-e2e-scale.sh`
3838

@@ -78,8 +78,6 @@ Prow Periodics:
7878
* [periodic-cluster-api-e2e-dualstack-and-ipv6-main] `./scripts/ci-e2e.sh`
7979
* DOCKER_IN_DOCKER_IPV6_ENABLED: `true`
8080
* GINKGO_SKIP: `[Conformance] [K8s-Upgrade]`
81-
* [periodic-cluster-api-e2e-workload-upgrade-1-22-1-23-main] `./scripts/ci-e2e.sh` FROM: `stable-1.22` TO: `stable-1.23`
82-
* GINKGO_FOCUS: `[K8s-Upgrade]`
8381
* [periodic-cluster-api-e2e-workload-upgrade-1-23-1-24-main] `./scripts/ci-e2e.sh` FROM: `stable-1.23` TO: `stable-1.24`
8482
* GINKGO_FOCUS: `[K8s-Upgrade]`
8583
* [periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main] `./scripts/ci-e2e.sh` FROM: `stable-1.24` TO: `stable-1.25`
@@ -88,7 +86,9 @@ Prow Periodics:
8886
* GINKGO_FOCUS: `[K8s-Upgrade]`
8987
* [periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-main] `./scripts/ci-e2e.sh` FROM: `stable-1.26` TO: `stable-1.27`
9088
* GINKGO_FOCUS: `[K8s-Upgrade]`
91-
* [periodic-cluster-api-e2e-workload-upgrade-1-27-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.27` TO: `ci/latest-1.28`
89+
* [periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-main] `./scripts/ci-e2e.sh` FROM: `stable-1.27` TO: `stable-1.28`
90+
* GINKGO_FOCUS: `[K8s-Upgrade]`
91+
* [periodic-cluster-api-e2e-workload-upgrade-1-28-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.28` TO: `ci/latest-1.29`
9292
* GINKGO_FOCUS: `[K8s-Upgrade]`
9393
* [cluster-api-push-images-nightly] Google Cloud Build: `make release-staging-nightly`
9494

@@ -125,18 +125,18 @@ Prow Periodics:
125125
[pull-cluster-api-e2e-informing-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-informing-main
126126
[pull-cluster-api-e2e-full-dualstack-and-ipv6-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-full-dualstack-and-ipv6-main
127127
[pull-cluster-api-e2e-full-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-full-main
128-
[pull-cluster-api-e2e-workload-upgrade-1-27-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-main-1-27-latest
128+
[pull-cluster-api-e2e-workload-upgrade-1-28-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-main-1-28-latest
129129
[pull-cluster-api-e2e-scale-main-experimental]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-scale-main-experimental
130130
[periodic-cluster-api-test-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-test-main
131131
[periodic-cluster-api-test-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-test-mink8s-main
132132
[periodic-cluster-api-e2e-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main
133133
[periodic-cluster-api-e2e-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-mink8s-main
134134
[periodic-cluster-api-e2e-dualstack-and-ipv6-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-dualstack-and-ipv6-main
135-
[periodic-cluster-api-e2e-workload-upgrade-1-22-1-23-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-22-1-23
136135
[periodic-cluster-api-e2e-workload-upgrade-1-23-1-24-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-23-1-24
137136
[periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-24-1-25
138137
[periodic-cluster-api-e2e-workload-upgrade-1-25-1-26-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-25-1-26
139138
[periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-26-1-27
140-
[periodic-cluster-api-e2e-workload-upgrade-1-27-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-27-latest
139+
[periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-27-1-28
140+
[periodic-cluster-api-e2e-workload-upgrade-1-28-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-28-latest
141141
[cluster-api-push-images-nightly]: https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#cluster-api-push-images-nightly
142142
[post-cluster-api-push-images]: https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-cluster-api-push-images

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ These diagrams show the relationships between components in a Cluster API releas
7878
| Kubernetes v1.19 | ✓ (only workload) | | | |
7979
| Kubernetes v1.20 | ✓ | | | |
8080
| Kubernetes v1.21 | ✓ | ✓ (only workload) | | |
81-
| Kubernetes v1.22 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
81+
| Kubernetes v1.22 | ✓ | ✓ (only workload) | ✓ (only workload) | |
8282
| Kubernetes v1.23* | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
83-
| Kubernetes v1.24 | ✓ | ✓ | ✓ | ✓ |
83+
| Kubernetes v1.24 | ✓ | ✓ | ✓ | ✓ (only workload) |
8484
| Kubernetes v1.25 | ✓ | ✓ | ✓ | ✓ |
8585
| Kubernetes v1.26 | ✓ | ✓ | ✓ | ✓ |
8686
| Kubernetes v1.27 | | ✓ | ✓ | ✓ |
87+
| Kubernetes v1.28 | | | ✓ | ✓ |
8788

8889

8990
\* 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.
@@ -101,12 +102,13 @@ The Core Provider also talks to API server of every Workload Cluster. Therefore,
101102
| Kubernetes v1.19 + kubeadm/v1beta2 | ✓ (only workload) | | | |
102103
| Kubernetes v1.20 + kubeadm/v1beta2 | ✓ | | | |
103104
| Kubernetes v1.21 + kubeadm/v1beta2 | ✓ | ✓ (only workload) | | |
104-
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
105+
| Kubernetes v1.22 + kubeadm/v1beta3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
105106
| Kubernetes v1.23 + kubeadm/v1beta3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
106-
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
107+
| Kubernetes v1.24 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ (only workload) |
107108
| Kubernetes v1.25 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
108109
| Kubernetes v1.26 + kubeadm/v1beta3 | ✓ | ✓ | ✓ | ✓ |
109110
| Kubernetes v1.27 + kubeadm/v1beta3 | | ✓ | ✓ | ✓ |
111+
| Kubernetes v1.28 + kubeadm/v1beta3 | | | ✓ | ✓ |
110112

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

@@ -118,12 +120,13 @@ The Kubeadm Bootstrap Provider generates kubeadm configuration using the API ver
118120
| Kubernetes v1.19 + etcd/v3 | ✓ (only workload) | | | |
119121
| Kubernetes v1.20 + etcd/v3 | ✓ | | | |
120122
| Kubernetes v1.21 + etcd/v3 | ✓ | ✓ (only workload) | | |
121-
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | ✓ (only workload) |
123+
| Kubernetes v1.22 + etcd/v3 | ✓ | ✓ (only workload) | ✓ (only workload) | |
122124
| Kubernetes v1.23 + etcd/v3 | ✓ | ✓ | ✓ (only workload) | ✓ (only workload) |
123-
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
125+
| Kubernetes v1.24 + etcd/v3 | ✓ | ✓ | ✓ | ✓ (only workload) |
124126
| Kubernetes v1.25 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
125127
| Kubernetes v1.26 + etcd/v3 | ✓ | ✓ | ✓ | ✓ |
126128
| Kubernetes v1.27 + etcd/v3 | | ✓ | ✓ | ✓ |
129+
| Kubernetes v1.28 + etcd/v3 | | | ✓ | ✓ |
127130

128131
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.
129132

@@ -144,6 +147,9 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
144147

145148
#### Kubernetes version specific notes
146149

150+
**1.28**:
151+
* No specific notes
152+
147153
**1.27**:
148154
* No specific notes
149155

0 commit comments

Comments
 (0)