Skip to content

Commit 5bc3819

Browse files
committed
github: adjust kubernetes bump template to decouple kind release and kubernetes version support
1 parent c2f66a9 commit 5bc3819

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

.github/ISSUE_TEMPLATE/kubernetes_bump.md

+23-10
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This issue is tracking the tasks that should be implemented **after** the Kubern
1212
## Tasks
1313

1414
Prerequisites:
15+
1516
* [ ] Decide which Cluster API release series will support the new Kubernetes version
1617
* If feasible we usually cherry-pick the changes back to the latest release series.
1718

@@ -21,20 +22,12 @@ This section contains tasks to update our book, e2e testing and CI to use and te
2122
as well as changes to Cluster API that we might have to make to support the new Kubernetes version. All of these
2223
changes should be cherry-picked to all release series that will support the new Kubernetes version.
2324

24-
* [ ] Modify quickstart and CAPD to use the new Kubernetes release:
25+
* [ ] Modify CAPD to use the new Kubernetes release:
2526
* Bump the Kubernetes version in:
2627
* `test/*`: search for occurrences of the previous Kubernetes version
27-
* `Tiltfile`
28-
* Ensure the latest available kind version is used (including the latest images for this kind release)
29-
* Add new images in the [kind mapper.go](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/infrastructure/kind/mapper.go#L79).
30-
* See the [kind releases page](https://github.com/kubernetes-sigs/kind/releases) for the list of released images.
31-
* Set new default image for the [test framework](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/framework/bootstrap/kind_provider.go#L40)
32-
* If code changes are required for CAPD to incorporate the new Kind version, update [kind latestMode](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/infrastructure/kind/mapper.go#L66)
33-
* Prior art: #10094
34-
* Verify the quickstart manually
3528
* Bump `InitWithKubernetesVersion` and `WorkloadKubernetesVersion` in `clusterctl_upgrade_test.go`
3629
* Note: Only bump for Cluster API versions that will support the new Kubernetes release.
37-
* Prior art: #9160
30+
* Prior art: TODO (previously #9160)
3831
* [ ] Ensure the jobs are adjusted to provide test coverage according to our [support policy](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions):
3932

4033
* At the `.versions` section in the `cluster-api-prowjob-gen.yaml` file in [test-infra](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api/):
@@ -58,10 +51,26 @@ changes should be cherry-picked to all release series that will support the new
5851
* [ ] Update book:
5952
* Update supported versions in `versions.md`
6053
* Prior art: #9161
54+
6155
* [ ] Issues specific to the Kubernetes minor release:
6256
* Sometimes there are adjustments that we have to make in Cluster API to be able to support
6357
a new Kubernetes minor version. Please add these issues here when they are identified.
6458

59+
### Improving quickstart and adding bumping to a new kind release
60+
61+
* [ ] Bump kind and modify quickstart to refer the new `kindest/node` image:
62+
* Bump the Kubernetes version in:
63+
* `docs/*`
64+
* `Tiltfile`
65+
* Ensure the latest available kind version is used (including the latest images for this kind release)
66+
* Add new images in the [kind mapper.go](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/infrastructure/kind/mapper.go#L79).
67+
* See the [kind releases page](https://github.com/kubernetes-sigs/kind/releases) for the list of released images.
68+
* Set new default image for the [test framework](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/framework/bootstrap/kind_provider.go#L40)
69+
* If code changes are required for CAPD to incorporate the new Kind version, update [kind latestMode](https://github.com/kubernetes-sigs/cluster-api/blob/0f47a19e038ee6b0d3b1e7675a62cdaf84face8c/test/infrastructure/kind/mapper.go#L66)
70+
* Prior art: #10094
71+
* Verify the quickstart manually
72+
* Prior art: TODO (previously #9160)
73+
6574
### Using new Kubernetes dependencies
6675

6776
This section contains tasks to update Cluster API to use the latest Kubernetes Go dependencies and related topics
@@ -86,3 +95,7 @@ run the Cluster API controllers on the new Kubernetes version.
8695
* Prior art: #7193
8796
* [ ] Bump conversion-gen via `CONVERSION_GEN_VER` in `Makefile`
8897
* Prior art: #7118
98+
99+
After release of CAPI v1.X.x (that supports Kubernetes v1.Y):
100+
101+
* [ ] Bump WorkloadKubernetesVersion for test When testing clusterctl upgrades using ClusterClass (v1.X=>current) [ClusterClass]

0 commit comments

Comments
 (0)