Skip to content

Commit 67faaee

Browse files
authored
Merge pull request #7983 from sbueringer/pr-go-version-policy
📖 backport policy: Add go version bumps
2 parents 610b27c + e87b6e0 commit 67faaee

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

.github/ISSUE_TEMPLATE/release_tracking.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Week 17:
6868

6969
Continuously:
7070
* [Release lead] [Maintain the GitHub release milestone](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#continuously-maintain-the-github-release-milestone)
71+
* [Release lead] [Bump the Go version](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#continuously-bump-the-go-version)
7172
* [Communications Manager] [Communicate key dates to the community](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#continuously-communicate-key-dates-to-the-community)
7273
* [Communications Manager] Improve release process documentation
7374
* [Communications Manager] Maintain and improve user facing documentation about releases, release policy and release calendar

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ We generally allow backports of following changes to all supported branches:
9292
- Dependency bumps for CVE (usually limited to CVE resolution; backports of non-CVE related version bumps are considered exceptions to be evaluated case by case)
9393
- Cert-manager version bumps (to avoid having releases with cert-manager versions that are out of support, when possible)
9494
- Changes required to support new Kubernetes versions, when possible. See [supported Kubernetes versions](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions) for more details.
95+
- Changes to use the latest Go patch release. If the Go minor version of a supported branch goes out of support, we will consider on a case-by-case basis
96+
to bump to a newer Go minor version (e.g. to pick up CVE fixes). This could have impact on everyone importing Cluster API.
9597

9698
We generally allow backports of following changes only to the latest supported branch:
9799
- Improvements to existing docs (the latest supported branch hosts the current version of the book)

docs/release/release-tasks.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ This document details the responsibilities and tasks for each role in the releas
2525
- [\[Track\] Bump dependencies](#track-bump-dependencies)
2626
- [Create a release branch](#create-a-release-branch)
2727
- [\[Continuously\] Maintain the GitHub release milestone](#continuously-maintain-the-github-release-milestone)
28+
- [\[Continuously\] Bump the Go version](#continuously-bump-the-go-version)
2829
- [\[Repeatedly\] Cut a release](#repeatedly-cut-a-release)
2930
- [\[Optional\] \[Track\] Bump the Cluster API apiVersion](#optional-track-bump-the-cluster-api-apiversion)
3031
- [\[Optional\] \[Track\] Bump the Kubernetes version](#optional-track-bump-the-kubernetes-version)
@@ -169,6 +170,17 @@ This can be done by:
169170
2. If nobody is working on an issue in the milestone, drop it from the milestone.
170171
3. Ensuring we have a plan to get `release-blocking` issues implemented in time.
171172

173+
#### [Continuously] Bump the Go version
174+
175+
The goal of this task is to ensure we are always using the latest Go version for our releases.
176+
177+
1. Keep track of new Go versions
178+
2. Bump the Go version in supported branches if necessary
179+
<br>Prior art: [Bump to Go 1.19.5](https://github.com/kubernetes-sigs/cluster-api/pull/7981)
180+
181+
Note: If the Go minor version of one of our supported branches goes out of supported, we should consider bumping
182+
to a newer Go minor version according to our [backport policy](./../../CONTRIBUTING.md#backporting-a-patch).
183+
172184
#### [Repeatedly] Cut a release
173185

174186
1. Ensure CI is stable before cutting the release (e.g. by checking with the CI manager)

0 commit comments

Comments
 (0)