Update prometheus and thanos versions (prometheus-operator#3946)

* Update prometheus and thanos versions * Remove alertmanager v1 call in prometheus test
pasancario · Apr 7, 2021 · cec7f2c · cec7f2c
1 parent 14fe686
commit cec7f2c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Documentation/compatibility.md b/Documentation/compatibility.md
@@ -64,6 +64,10 @@ The versions of Prometheus compatible to be run with the Prometheus Operator are
 * v2.23.0
 * v2.24.0
 * v2.24.1
+* v2.25.0
+* v2.25.1
+* v2.25.2
+* v2.26.0
 
 ## Alertmanager
 

diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go
@@ -20,7 +20,7 @@ const (
 	DefaultAlertmanagerVersion   = "v0.21.0"
 	DefaultAlertmanagerBaseImage = "quay.io/prometheus/alertmanager"
 	DefaultAlertmanagerImage     = DefaultAlertmanagerBaseImage + ":" + DefaultAlertmanagerVersion
-	DefaultThanosVersion         = "v0.17.2"
+	DefaultThanosVersion         = "v0.18.0"
 	DefaultThanosBaseImage       = "quay.io/thanos/thanos"
 	DefaultThanosImage           = DefaultThanosBaseImage + ":" + DefaultThanosVersion
 )
@@ -67,6 +67,10 @@ var (
 		"v2.23.0",
 		"v2.24.0",
 		"v2.24.1",
+		"v2.25.0",
+		"v2.25.1",
+		"v2.25.2",
+		"v2.26.0",
 	}
 	DefaultPrometheusVersion   = PrometheusCompatibilityMatrix[len(PrometheusCompatibilityMatrix)-1]
 	DefaultPrometheusBaseImage = "quay.io/prometheus/prometheus"

diff --git a/test/e2e/prometheus_test.go b/test/e2e/prometheus_test.go
@@ -3640,7 +3640,7 @@ func isAlertmanagerDiscoveryWorking(ns, promSVCName, alertmanagerName string) fu
 		}
 		expectedAlertmanagerTargets := []string{}
 		for _, p := range pods.Items {
-			expectedAlertmanagerTargets = append(expectedAlertmanagerTargets, fmt.Sprintf("http://%s:9093/api/v1/alerts", p.Status.PodIP))
+			expectedAlertmanagerTargets = append(expectedAlertmanagerTargets, fmt.Sprintf("http://%s:9093/api/v2/alerts", p.Status.PodIP))
 		}
 
 		response, err := framework.PrometheusSVCGetRequest(ns, promSVCName, "/api/v1/alertmanagers", map[string]string{})