Merge pull request #1541 from brancz/cut-0.21.0

Cut 0.21.0

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * [CHANGE] Deprecate specification of Prometheus rules via ConfigMaps in favor of `PrometheusRule` CRDs
 
+## 0.21.0 / 2018-06-28
+
+* [CHANGE] Default to Prometheus v2.3.1.
+* [CHANGE] Default to Alertmanager v0.15.0.
+* [FEATURE] Make remote write queue configurations configurable.
+* [FEATURE] Add Thanos integration (experimental).
+* [BUGFIX] Fix usage of console templates and libraries.
+
 ## 0.20.0 / 2018-06-05
 
 With this release we introduce a new Custom Resource Definition - the

Documentation/user-guides/cluster-monitoring.md

@@ -60,8 +60,8 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
-        image: quay.io/coreos/prometheus-operator:v0.20.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
+        image: quay.io/coreos/prometheus-operator:v0.21.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

VERSION

@@ -1 +1 @@
-0.20.0
+0.21.0

contrib/kube-prometheus/jsonnetfile.json

@@ -9,6 +9,16 @@
                 }
             },
             "version": "."
+        },
+        {
+            "name": "prometheus-operator",
+            "source": {
+                "git": {
+                    "remote": "../../",
+                    "subdir": "jsonnet/prometheus-operator"
+                }
+            },
+            "version": "."
         }
     ]
 }

contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml

@@ -19,8 +19,8 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
-        image: quay.io/coreos/prometheus-operator:v0.20.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
+        image: quay.io/coreos/prometheus-operator:v0.21.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

example/non-rbac/prometheus-operator.yaml

@@ -19,8 +19,8 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
-        image: quay.io/coreos/prometheus-operator:v0.20.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
+        image: quay.io/coreos/prometheus-operator:v0.21.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

example/rbac/prometheus-operator/prometheus-operator-deployment.yaml

@@ -19,8 +19,8 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
-        image: quay.io/coreos/prometheus-operator:v0.20.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
+        image: quay.io/coreos/prometheus-operator:v0.21.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

jsonnet/prometheus-operator/prometheus-operator.libsonnet

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      prometheusOperator: 'v0.20.0',
+      prometheusOperator: 'v0.21.0',
       configmapReloader: 'v0.0.1',
     },