Update Prometheus to 2.2.1

Documentation/compatibility.md

@@ -32,3 +32,4 @@ The versions of Prometheus compatible to be run with the Prometheus Operator are
 * v1.7.2
 * v1.8.0
 * v2.0.0
+* v2.2.1

Documentation/user-guides/cluster-monitoring.md

@@ -357,7 +357,7 @@ metadata:
     prometheus: k8s
 spec:
   replicas: 2
-  version: v2.2.0-rc.1
+  version: v2.2.1
   serviceAccountName: prometheus-k8s
   serviceMonitorSelector:
     matchExpressions:

contrib/kube-prometheus/manifests/prometheus/prometheus-k8s.yaml

@@ -6,7 +6,7 @@ metadata:
     prometheus: k8s
 spec:
   replicas: 2
-  version: v2.2.0-rc.1
+  version: v2.2.1
   serviceAccountName: prometheus-k8s
   serviceMonitorSelector:
     matchExpressions:

helm/kube-prometheus/Chart.yaml

@@ -9,4 +9,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.29
+version: 0.0.31

helm/kube-prometheus/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.20
+    version: 0.0.21
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 

helm/kube-prometheus/values.yaml

@@ -160,7 +160,7 @@ prometheus:
   ##
   image:
     repository: quay.io/prometheus/prometheus
-    tag: v2.1.0
+    tag: v2.2.1
 
   ingress:
     ## If true, Prometheus Ingress will be created

helm/prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.20
+version: 0.0.21

helm/prometheus/values.yaml

@@ -31,7 +31,7 @@ selfServiceMonitor: true
 ##
 image:
   repository: quay.io/prometheus/prometheus
-  tag: v2.1.0
+  tag: v2.2.1
 
 ## Labels to be added to the Prometheus
 ##

pkg/prometheus/statefulset.go

@@ -37,7 +37,7 @@ import (
 
 const (
 	governingServiceName = "prometheus-operated"
-	DefaultVersion       = "v2.2.0-rc.1"
+	DefaultVersion       = "v2.2.1"
 	defaultRetention     = "24h"
 	configMapsFilename   = "configmaps.json"
 	prometheusConfDir    = "/etc/prometheus/config"
@@ -72,6 +72,7 @@ var (
 		"v1.7.2",
 		"v1.8.0",
 		"v2.0.0",
+		"v2.2.1",
 	}
 )