diff --git a/README.md b/README.md index 3323dad6..a3059d20 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,13 @@ no effect, but is still deployed. The following Kubernetes versions are supported and work as we test against these versions in their respective branches. But note that other versions might work! -| kube-prometheus stack | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | -|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------| -| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✔ | ✔ | ✗ | ✗ | ✗ | x | x | x | -| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗ | ✔ | ✔ | ✗ | ✗ | x | x | x | -| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗ | ✗ | ✔ | ✔ | ✗ | x | x | x | -| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗ | ✗ | ✗ | ✔ | ✔ | x | x | x | -| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | ✗ | x | x | ✔ | ✔ | +| kube-prometheus stack | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | +|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------| +| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✔ | ✔ | ✗ | ✗ | x | x | x | +| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗ | ✔ | ✔ | ✗ | x | x | x | +| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗ | ✗ | ✔ | ✔ | x | x | x | +| [`release-0.13`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.13) | ✗ | ✗ | ✗ | x | x | ✔ | ✔ | +| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | x | x | ✔ | ✔ | ## Quickstart diff --git a/RELEASE.md b/RELEASE.md index 682578f8..a5c614c1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,10 +1,13 @@ # Release schedule Kube-prometheus has a somehow predictable release schedule, releases were -historically cut in sync with OpenShift releases as per downstream needs. So -far there hasn't been any problem with this schedule since it is also in sync -with Kubernetes releases. So for every new Kubernetes release, there is a new -release of kube-prometheus, although it tends to happen later. +historically cut in sync with OpenShift releases as per downstream needs. + +This has been changed in favour of tracking upstream Kubernetes releases due +to changing needs and requirements in the OpenShift release process. + +For every new Kubernetes release, there will be a corresponding new release +of kube-prometheus, although it tends to happen later. # How to cut a new release @@ -30,12 +33,6 @@ master. Try to avoid that situation. Maintaining the release branches for older minor releases happens on a best effort basis. -## Cut a release of kubernetes-mixins - -kube-prometheus and kubernetes-mixins releases are tied, so before cutting the -release of kube-prometheus we should make sure that the same release of -kubernetes-mixins exists. - ## Update components version Every release of kube-prometheus should include the latest versions of each