11# Release schedule
22
3- Kube-prometheus has a somehow predictable release schedule, releases were
4- historically cut in sync with OpenShift releases as per downstream needs.
3+ kube-prometheus will follow the Kubernetes release schedule.
4+ For every new Kubernetes release, there will be a corresponding minor release of
5+ kube-prometheus, although it may not be immediate.
56
6- This has been changed in favour of tracking upstream Kubernetes releases due
7- to changing needs and requirements in the OpenShift release process.
7+ We do not guarantee backports from the ` main ` branch to older release branches.
88
9- For every new Kubernetes release, there will be a corresponding new release
10- of kube-prometheus, although it tends to happen later.
9+ This differs from the previous release schedule, which was driven by OpenShift releases.
1110
1211# How to cut a new release
1312
@@ -21,17 +20,9 @@ We use [Semantic Versioning](http://semver.org/).
2120We maintain a separate branch for each minor release, named
2221` release-<major>.<minor> ` , e.g. ` release-1.1 ` , ` release-2.0 ` .
2322
24- The usual flow is to merge new features and changes into the master branch and
25- to merge bug fixes into the latest release branch. Bug fixes are then merged
26- into master from the latest release branch. The master branch should always
27- contain all commits from the latest release branch.
28-
29- If a bug fix got accidentally merged into master, cherry-pick commits have to be
30- created in the latest release branch, which then has to be merged back into
31- master. Try to avoid that situation.
32-
33- Maintaining the release branches for older minor releases happens on a best
34- effort basis.
23+ The usual flow is to merge new features, changes and bug fixes into the ` main ` branch.
24+ The decision to backport bugfixes into release branches is made on a case-by-case basis.
25+ Maintaining the release branches for older minor releases is best-effort.
3526
3627## Update components version
3728
@@ -47,7 +38,7 @@ failed or because the main branch was already up-to-date.
4738
4839## Update Kubernetes supported versions
4940
50- The main branch of kube-prometheus should support the last 2 versions of
41+ The ` main ` branch of kube-prometheus should support the last 2 versions of
5142Kubernetes. We need to make sure that the CI on the main branch is testing the
5243kube-prometheus configuration against both of these versions by updating the [ CI
5344worklow] ( .github/workflows/ci.yaml ) to include the latest kind version and the
0 commit comments