From 2c0a59c2af6ed9d0dca972a41ee92414beefa33c Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 13 Sep 2023 13:53:33 +0200 Subject: [PATCH] Update Go backport policy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1673d3c5332..9ca47376d125 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,8 +96,9 @@ We generally allow backports of following changes to all supported branches: - 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) - Cert-manager version bumps (to avoid having releases with cert-manager versions that are out of support, when possible) - 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. -- 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 - to bump to a newer Go minor version (e.g. to pick up CVE fixes). This could have impact on everyone importing Cluster API. +- Changes to use the latest Go patch version to build controller images. +- Changes to bump the Go minor version used to build controller images, if the Go minor version of a supported branch goes out of support (e.g. to pick up bug and CVE fixes). + This has no impact on folks importing Cluster API as we won't modify the version in `go.mod` and the version in the `Makefile` does not affect them. We generally allow backports of following changes only to the latest supported branch: - Improvements to existing docs (the latest supported branch hosts the current version of the book)