bump thanos image and version

Signed-off-by: yeya24 <yb532204897@gmail.com>

Documentation/thanos.md

@@ -64,7 +64,7 @@ Prometheus Custom Resource, after creating the secret.
 spec:
   ...
   thanos:
-    baseImage: improbable/thanos
+    baseImage: quay.io/thanos/thanos
     version: v0.2.1
     objectStorageConfig:
       key: thanos.yaml

cmd/operator/main.go

@@ -136,7 +136,7 @@ func init() {
 	flagset.StringVar(&cfg.ConfigReloaderMemory, "config-reloader-memory", "25Mi", "Config Reloader Memory. Value \"0\" disables it and causes no limit to be configured.")
 	flagset.StringVar(&cfg.AlertmanagerDefaultBaseImage, "alertmanager-default-base-image", "quay.io/prometheus/alertmanager", "Alertmanager default base image")
 	flagset.StringVar(&cfg.PrometheusDefaultBaseImage, "prometheus-default-base-image", "quay.io/prometheus/prometheus", "Prometheus default base image")
-	flagset.StringVar(&cfg.ThanosDefaultBaseImage, "thanos-default-base-image", "improbable/thanos", "Thanos default base image")
+	flagset.StringVar(&cfg.ThanosDefaultBaseImage, "thanos-default-base-image", "quay.io/thanos/thanos", "Thanos default base image")
 	flagset.Var(ns, "namespaces", "Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces.")
 	flagset.Var(deniedNs, "deny-namespaces", "Namespaces not to scope the interaction of the Prometheus Operator (deny list). This is mutually exclusive with --namespaces.")
 	flagset.Var(&cfg.Labels, "labels", "Labels to be add to all resources created by the operator")

example/thanos/query-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: thanos-query
-        image: improbable/thanos:v0.5.0
+        image: quay.io/thanos/thanos:v0.7.0
         args:
         - query
         - --log.level=debug

pkg/prometheus/statefulset.go

@@ -35,7 +35,7 @@ import (
 const (
 	governingServiceName            = "prometheus-operated"
 	DefaultPrometheusVersion        = "v2.7.1"
-	DefaultThanosVersion            = "v0.5.0"
+	DefaultThanosVersion            = "v0.7.0"
 	defaultRetention                = "24h"
 	defaultReplicaExternalLabelName = "prometheus_replica"
 	storageDir                      = "/prometheus"

pkg/prometheus/statefulset_test.go

@@ -36,7 +36,7 @@ var (
 		ConfigReloaderMemory:          "25Mi",
 		PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
 		PrometheusDefaultBaseImage:    "quay.io/prometheus/prometheus",
-		ThanosDefaultBaseImage:        "improbable/thanos",
+		ThanosDefaultBaseImage:        "quay.io/thanos/thanos",
 	}
 )
 
@@ -470,7 +470,7 @@ func TestThanosTagAndShaAndVersion(t *testing.T) {
 		}
 
 		image := sset.Spec.Template.Spec.Containers[2].Image
-		expected := "improbable/thanos:my-unrelated-tag"
+		expected := "quay.io/thanos/thanos:my-unrelated-tag"
 		if image != expected {
 			t.Fatalf("Unexpected container image.\n\nExpected: %s\n\nGot: %s", expected, image)
 		}
@@ -493,7 +493,7 @@ func TestThanosTagAndShaAndVersion(t *testing.T) {
 		}
 
 		image := sset.Spec.Template.Spec.Containers[2].Image
-		expected := "improbable/thanos@sha256:7384a79f4b4991bf8269e7452390249b7c70bcdd10509c8c1c6c6e30e32fb324"
+		expected := "quay.io/thanos/thanos@sha256:7384a79f4b4991bf8269e7452390249b7c70bcdd10509c8c1c6c6e30e32fb324"
 		if image != expected {
 			t.Fatalf("Unexpected container image.\n\nExpected: %s\n\nGot: %s", expected, image)
 		}
@@ -701,7 +701,7 @@ func TestSidecarsNoCPULimits(t *testing.T) {
 		ConfigReloaderMemory:          "50Mi",
 		PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
 		PrometheusDefaultBaseImage:    "quay.io/prometheus/prometheus",
-		ThanosDefaultBaseImage:        "improbable/thanos",
+		ThanosDefaultBaseImage:        "quay.io/thanos/thanos:v0.7.0",
 	}
 	sset, err := makeStatefulSet(monitoringv1.Prometheus{
 		Spec: monitoringv1.PrometheusSpec{},
@@ -727,7 +727,7 @@ func TestSidecarsNoMemoryLimits(t *testing.T) {
 		ConfigReloaderMemory:          "0",
 		PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
 		PrometheusDefaultBaseImage:    "quay.io/prometheus/prometheus",
-		ThanosDefaultBaseImage:        "improbable/thanos",
+		ThanosDefaultBaseImage:        "quay.io/thanos/thanos:v0.7.0",
 	}
 	sset, err := makeStatefulSet(monitoringv1.Prometheus{
 		Spec: monitoringv1.PrometheusSpec{},

test/e2e/prometheus_test.go

@@ -1298,7 +1298,7 @@ func testThanos(t *testing.T) {
 		t.Fatal("Making thanos query deployment failed: ", err)
 	}
 	// override image
-	qryImage := "improbable/thanos:" + version
+	qryImage := "quay.io/thanos/thanos:" + version
 	t.Log("setting up query with image: ", qryImage)
 	qryDep.Spec.Template.Spec.Containers[0].Image = qryImage
 	// override args