OperatorConfig CRD supports more of alertmanager_config

GoogleCloudPlatform · Sep 29, 2021 · 61d1abd · 61d1abd
1 parent 176f5be
commit 61d1abd
Show file tree

Hide file tree

Showing 5 changed files with 327 additions and 17 deletions.
diff --git a/cmd/operator/deploy/operator/clusterrole.yaml b/cmd/operator/deploy/operator/clusterrole.yaml
@@ -48,6 +48,7 @@ rules:
   - certificatesigningrequests
   - rules
   - operatorconfigs
+  - secrets
   verbs: ["create", "update", "get", "list", "watch", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/cmd/operator/deploy/operator/operator.yaml b/cmd/operator/deploy/operator/operator.yaml
@@ -76,7 +76,7 @@ spec:
       serviceAccountName: operator
       containers:
       - name: operator
-        image: gcr.io/gpe-test-1/prometheus-engine/operator:bench_20210309_1843
+        image: gcr.io/gpe-test-1/prometheus-engine/operator:managed
         args:
         - "--priority-class=gmp-critical"
         - "--ca-selfsign=false"

diff --git a/cmd/rule-evaluator/main.go b/cmd/rule-evaluator/main.go
@@ -43,6 +43,9 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/discovery"
+
+	// Import to enable 'kubernetes_sd_configs' to SD config register.
+	_ "github.com/prometheus/prometheus/discovery/kubernetes"
 	"github.com/prometheus/prometheus/notifier"
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/promql"

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -68,7 +68,7 @@ const (
 	// ImageConfigReloader = "gcr.io/gke-release-staging/prometheus-engine/gpe-config-reloader:v0.0.0.gke.0"
 	ImageCollector      = "gcr.io/gpe-test-1/prometheus:v2.27.1-gpe.0"
 	ImageConfigReloader = "gcr.io/gpe-test-1/gpe-config-reloader:v0.0.1"
-	ImageRuleEvaluator  = "gcr.io/gpe-test-1/prometheus-engine/rule-evaluator:bench_20211309_1504"
+	ImageRuleEvaluator  = "gcr.io/gpe-test-1/prometheus-engine/rule-evaluator:managed"
 )
 
 var (
@@ -172,7 +172,7 @@ func New(logger logr.Logger, clientConfig *rest.Config, registry prometheus.Regi
 		return nil, errors.Wrap(err, "build Kubernetes clientset")
 	}
 	// Create temporary directory to store webhook serving cert files.
-	certDir, err := ioutil.TempDir("", "prometheus-engine-operator-certs")
+	certDir, err := ioutil.TempDir("", "operator-cert")
 	if err != nil {
 		return nil, errors.Wrap(err, "create temporary certificate dir")
 	}