You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+18-8Lines changed: 18 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -82,16 +82,26 @@ The test module, clusterctl, and experiments do not provide any backward compati
82
82
83
83
#### Backporting a patch
84
84
85
-
We only accept backports of critical bugs, security issues, or bugs without easy workarounds, any
86
-
backport MUST not be breaking for either API or behavioral changes. In order to improve user/developer experience
87
-
maintainers can choose to backport:
88
-
- Doc improvements
85
+
We generally do not accept PRs directly against release branches, while we might accept backports of fixes/changes already
86
+
merged into the main branch.
87
+
88
+
Any backport MUST not be breaking for either API or behavioral changes.
89
+
90
+
We generally allow backports of following changes to all supported branches:
91
+
- Critical bugs fixes, security issue fixes, or fixes for bugs without easy workarounds.
92
+
- 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)
93
+
- Cert-manager version bumps (to avoid having releases with cert-manager versions that are out of support, when possible)
94
+
- 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
+
96
+
We generally allow backports of following changes only to the latest supported branch:
97
+
- Improvements to existing docs (the latest supported branch hosts the current version of the book)
89
98
- Improvements to CI signal
90
-
- Improvements to the test framework (enabling improvements to provider's test signal)
91
-
- Cert-manager bump (to avoid having branch using cert-manager versions out of support, when possible)
92
-
- Changes required to support new Kubernetes versions, when possible.
99
+
- Improvements to the test framework
100
+
101
+
Like any other activity in the project, backporting a fix/change is a community-driven effort and requires that someone volunteers to own the task.
102
+
In most cases, the cherry-pick bot can (and should) be used to automate opening a cherry-pick PR.
93
103
94
-
We generally do not accept PRs against older release branches.
104
+
We generally do not accept backports to Cluster API release branches that are [out of support](https://github.com/kubernetes-sigs/cluster-api/blob/main/CONTRIBUTING.md#support-and-guarantees).
0 commit comments