Update Prometheus to v2.3.2 and Alertmanager to 0.15.2

Documentation/user-guides/cluster-monitoring.md

@@ -413,7 +413,7 @@ spec:
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
-  version: v2.3.1
+  version: v2.3.2
 ```
 
 > Make sure that the `ServiceAccount` called `prometheus-k8s` exists and if using RBAC, is bound to the correct role. Read more on [RBAC when using the Prometheus Operator](../rbac.md).
@@ -598,7 +598,7 @@ spec:
     beta.kubernetes.io/os: linux
   replicas: 3
   serviceAccountName: alertmanager-main
-  version: v0.15.0
+  version: v0.15.2
 ```
 
 Read more in the [alerting guide](alerting.md) on how to configure the Alertmanager as it will not spin up unless it has a valid configuration mounted through a `Secret`. Note that the `Secret` has to be in the same namespace as the `Alertmanager` resource as well as have the name `alertmanager-<name-of-alertmanager-object` and the key of the configuration is `alertmanager.yaml`.

contrib/kube-prometheus/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      alertmanager: 'v0.15.0',
+      alertmanager: 'v0.15.2',
     },
 
     imageRepos+:: {

contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      prometheus: 'v2.3.1',
+      prometheus: 'v2.3.2',
     },
 
     imageRepos+:: {

contrib/kube-prometheus/jsonnetfile.lock.json

@@ -8,7 +8,7 @@
                     "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
                 }
             },
-            "version": "cfb1c0ac6c458401cf47390a35d48b707612af0a"
+            "version": "7590ad813c4661efbe13241611961cdb2f4dc5a6"
         },
         {
             "name": "ksonnet",
@@ -48,7 +48,7 @@
                     "subdir": "grafana-builder"
                 }
             },
-            "version": "a17504d81e2ab5b29d97c77faf72b8d7644bbabf"
+            "version": "8c4610783991b82ff12e485d24ac4f82d8839743"
         },
         {
             "name": "grafana",
@@ -78,7 +78,7 @@
                     "subdir": "Documentation/etcd-mixin"
                 }
             },
-            "version": "3c89938adf2988a2a2f6bb031cb075ae38ae1d0e"
+            "version": "2a6bc7d1130d2fa3336af5ffa2bcf82d760c945e"
         }
     ]
 }

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

@@ -11,4 +11,4 @@ spec:
     beta.kubernetes.io/os: linux
   replicas: 3
   serviceAccountName: alertmanager-main
-  version: v0.15.0
+  version: v0.15.2

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

@@ -25,4 +25,4 @@ spec:
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
-  version: v2.3.1
+  version: v2.3.2

pkg/alertmanager/statefulset.go

@@ -33,7 +33,7 @@ import (
 
 const (
 	governingServiceName   = "alertmanager-operated"
-	defaultVersion         = "v0.15.1"
+	defaultVersion         = "v0.15.2"
 	defaultRetention       = "120h"
 	secretsDir             = "/etc/alertmanager/secrets/"
 	alertmanagerConfDir    = "/etc/alertmanager/config"

pkg/alertmanager/statefulset_test.go

@@ -290,7 +290,7 @@ func TestMakeStatefulSetSpecMeshClusterFlags(t *testing.T) {
 		wrongHAPrefix string
 	}{
 		{"v0.14.0", "mesh", "cluster"},
-		{"v0.15.0", "cluster", "mesh"},
+		{"v0.15.2", "cluster", "mesh"},
 	}
 
 	for _, test := range tests {
@@ -326,7 +326,7 @@ func TestMakeStatefulSetSpecPeerFlagPort(t *testing.T) {
 		portNeeded bool
 	}{
 		{"v0.14.0", false},
-		{"v0.15.0", true},
+		{"v0.15.2", true},
 	}
 
 	for _, test := range tests {
@@ -399,7 +399,7 @@ func TestTagAndVersion(t *testing.T) {
 	sset, err := makeStatefulSet(&monitoringv1.Alertmanager{
 		Spec: monitoringv1.AlertmanagerSpec{
 			Tag:     "my-unrelated-tag",
-			Version: "v0.15.0",
+			Version: "v0.15.2",
 		},
 	}, nil, defaultTestConfig)
 	if err != nil {

pkg/prometheus/statefulset_test.go

@@ -365,7 +365,7 @@ func TestTagAndVersion(t *testing.T) {
 	sset, err := makeStatefulSet(monitoringv1.Prometheus{
 		Spec: monitoringv1.PrometheusSpec{
 			Tag:     "my-unrelated-tag",
-			Version: "v2.3.1",
+			Version: "v2.3.2",
 		},
 	}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
 	if err != nil {
@@ -453,8 +453,8 @@ func TestRetention(t *testing.T) {
 	}{
 		{"v1.8.2", "", "-storage.local.retention=24h"},
 		{"v1.8.2", "1d", "-storage.local.retention=1d"},
-		{"v2.3.1", "", "--storage.tsdb.retention=24h"},
-		{"v2.3.1", "1d", "--storage.tsdb.retention=1d"},
+		{"v2.3.2", "", "--storage.tsdb.retention=24h"},
+		{"v2.3.2", "1d", "--storage.tsdb.retention=1d"},
 	}
 
 	for _, test := range tests {

test/e2e/alertmanager_test.go

@@ -90,7 +90,7 @@ func TestAlertmanagerVersionMigration(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	am.Spec.Version = "v0.15.0-rc.1"
+	am.Spec.Version = "v0.15.2"
 	if err := framework.UpdateAlertmanagerAndWaitUntilReady(ns, am); err != nil {
 		t.Fatal(err)
 	}
@@ -133,7 +133,7 @@ func TestMeshInitialization(t *testing.T) {
 
 	// Starting with Alertmanager v0.15.0 hashicorp/memberlist is used for HA.
 	// Make sure both memberlist as well as mesh (< 0.15.0) work
-	amVersions := []string{"v0.14.0", "v0.15.0-rc.1"}
+	amVersions := []string{"v0.14.0", "v0.15.2"}
 
 	for _, v := range amVersions {
 		version := v
@@ -179,7 +179,6 @@ func TestAlertmanagerClusterGossipSilences(t *testing.T) {
 
 	amClusterSize := 3
 	alertmanager := framework.MakeBasicAlertmanager("test", int32(amClusterSize))
-	alertmanager.Spec.Version = "v0.15.0-rc.1"
 
 	if err := framework.CreateAlertmanagerAndWaitUntilReady(ns, alertmanager); err != nil {
 		t.Fatal(err)