Merge pull request prometheus-operator#1789 from mxinden/release-0.23

*: Cut v0.23.1
jungopro · Aug 13, 2018 · ba92b2f · ba92b2f
2 parents af44fca + 992a4a8
commit ba92b2f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.23.1 / 2018-08-13
+
+* [BUGFIX] Fix high CPU usage of Prometheus Operator when annotating Prometheus resource (#1785)
+
 ## 0.23.0 / 2018-08-06
 
 * [CHANGE] Deprecate specification of Prometheus rules via ConfigMaps in favor of `PrometheusRule` CRDs

diff --git a/Documentation/user-guides/getting-started.md b/Documentation/user-guides/getting-started.md
@@ -117,8 +117,8 @@ spec:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
-        image: quay.io/coreos/prometheus-operator:v0.23.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1
+        image: quay.io/coreos/prometheus-operator:v0.23.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.23.0
+0.23.1
diff --git a/bundle.yaml b/bundle.yaml
@@ -99,8 +99,8 @@ spec:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
-        image: quay.io/coreos/prometheus-operator:v0.23.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1
+        image: quay.io/coreos/prometheus-operator:v0.23.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/example/non-rbac/prometheus-operator.yaml b/example/non-rbac/prometheus-operator.yaml
@@ -20,8 +20,8 @@ spec:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
-        image: quay.io/coreos/prometheus-operator:v0.23.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1
+        image: quay.io/coreos/prometheus-operator:v0.23.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
@@ -20,8 +20,8 @@ spec:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
-        image: quay.io/coreos/prometheus-operator:v0.23.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1
+        image: quay.io/coreos/prometheus-operator:v0.23.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      prometheusOperator: 'v0.23.0',
+      prometheusOperator: 'v0.23.1',
       configmapReloader: 'v0.0.1',
     },