diff --git a/Makefile b/Makefile index f8195b2762..4f687e7b5e 100644 --- a/Makefile +++ b/Makefile @@ -123,10 +123,10 @@ presubmit: ## Run all checks and tests before submitting a change ## presubmit: regen bin test kindtest -CURRENT_TAG = v0.6.3-gke.0 +CURRENT_TAG = v0.7.0-gke.0 CURRENT_PROM_TAG = v2.35.0-gmp.5-gke.0 CURRENT_AM_TAG = v0.24.0-gmp.3-gke.1 -LABEL_API_VERSION = 0.6.3 +LABEL_API_VERSION = 0.7.0 FILES_TO_UPDATE = $(shell find . -type f -name "*.yaml" ! -name "kube-state-metrics.yaml" ! -name "node-exporter.yaml") updateversions: $(SED) @echo ">> Updating prometheus-engine images in manifests to $(CURRENT_TAG)" diff --git a/cmd/operator/deploy/operator/05-deployment.yaml b/cmd/operator/deploy/operator/05-deployment.yaml index cbc736bec5..6831acb0c7 100644 --- a/cmd/operator/deploy/operator/05-deployment.yaml +++ b/cmd/operator/deploy/operator/05-deployment.yaml @@ -36,14 +36,14 @@ spec: app.kubernetes.io/component: operator app.kubernetes.io/name: gmp-operator app.kubernetes.io/part-of: gmp - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 spec: serviceAccountName: operator automountServiceAccountToken: true priorityClassName: gmp-critical containers: - name: operator - image: gke.gcr.io/prometheus-engine/operator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/operator:v0.7.0-gke.0 args: - "--operator-namespace=gmp-system" - "--public-namespace=gmp-public" diff --git a/cmd/operator/deploy/operator/10-collector.yaml b/cmd/operator/deploy/operator/10-collector.yaml index 367ae9f056..acd53a3a4c 100644 --- a/cmd/operator/deploy/operator/10-collector.yaml +++ b/cmd/operator/deploy/operator/10-collector.yaml @@ -28,7 +28,7 @@ spec: labels: app: managed-prometheus-collector app.kubernetes.io/name: collector - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: # The emptyDir for the storage and config directories prevents cluster # autoscaling unless this annotation is set. @@ -53,7 +53,7 @@ spec: privileged: false containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml diff --git a/cmd/operator/deploy/operator/11-rule-evaluator.yaml b/cmd/operator/deploy/operator/11-rule-evaluator.yaml index 2d4868e754..a1f2a7950d 100644 --- a/cmd/operator/deploy/operator/11-rule-evaluator.yaml +++ b/cmd/operator/deploy/operator/11-rule-evaluator.yaml @@ -29,7 +29,7 @@ spec: labels: app: managed-prometheus-rule-evaluator app.kubernetes.io/name: rule-evaluator - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: # The emptyDir for the storage and config directories prevents cluster # autoscaling unless this annotation is set. @@ -54,7 +54,7 @@ spec: privileged: false containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -91,7 +91,7 @@ spec: - all privileged: false - name: evaluator - image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.0-gke.0 args: - --config.file=/prometheus/config_out/config.yaml - --web.listen-address=:19092 diff --git a/cmd/operator/deploy/operator/12-alertmanager.yaml b/cmd/operator/deploy/operator/12-alertmanager.yaml index 47369f29a5..1981990065 100644 --- a/cmd/operator/deploy/operator/12-alertmanager.yaml +++ b/cmd/operator/deploy/operator/12-alertmanager.yaml @@ -41,7 +41,7 @@ spec: labels: app: managed-prometheus-alertmanager app.kubernetes.io/name: alertmanager - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" components.gke.io/component-name: managed_prometheus @@ -96,7 +96,7 @@ spec: - all privileged: false - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/alertmanager/config.yaml - --config-file-output=/alertmanager/config_out/config.yaml diff --git a/cmd/operator/deploy/rule-evaluator/01-deployment.yaml b/cmd/operator/deploy/rule-evaluator/01-deployment.yaml index a666fd09da..170da61181 100644 --- a/cmd/operator/deploy/rule-evaluator/01-deployment.yaml +++ b/cmd/operator/deploy/rule-evaluator/01-deployment.yaml @@ -27,7 +27,7 @@ spec: metadata: labels: app.kubernetes.io/name: rule-evaluator - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 spec: serviceAccountName: rule-evaluator automountServiceAccountToken: true @@ -40,7 +40,7 @@ spec: mountPath: /prometheus/config_out containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -74,7 +74,7 @@ spec: - all privileged: false - name: evaluator - image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.0-gke.0 args: - "--config.file=/prometheus/config_out/config.yaml" - "--web.listen-address=:9092" diff --git a/examples/frontend.yaml b/examples/frontend.yaml index 283ba76502..a3d22dad59 100644 --- a/examples/frontend.yaml +++ b/examples/frontend.yaml @@ -43,7 +43,7 @@ spec: - linux containers: - name: frontend - image: gke.gcr.io/prometheus-engine/frontend:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/frontend:v0.7.0-gke.0 args: - "--web.listen-address=:9090" - "--query.project-id=$PROJECT_ID" diff --git a/examples/prometheus.yaml b/examples/prometheus.yaml index 0536a855b4..7327bcb257 100644 --- a/examples/prometheus.yaml +++ b/examples/prometheus.yaml @@ -134,7 +134,7 @@ spec: - name: prometheus-db mountPath: /prometheus/data - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml diff --git a/manifests/operator.yaml b/manifests/operator.yaml index fa9ae9b51e..ca9fea7438 100644 --- a/manifests/operator.yaml +++ b/manifests/operator.yaml @@ -238,14 +238,14 @@ spec: app.kubernetes.io/component: operator app.kubernetes.io/name: gmp-operator app.kubernetes.io/part-of: gmp - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 spec: serviceAccountName: operator automountServiceAccountToken: true priorityClassName: gmp-critical containers: - name: operator - image: gke.gcr.io/prometheus-engine/operator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/operator:v0.7.0-gke.0 args: - "--operator-namespace=gmp-system" - "--public-namespace=gmp-public" @@ -534,7 +534,7 @@ spec: labels: app: managed-prometheus-collector app.kubernetes.io/name: collector - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: # The emptyDir for the storage and config directories prevents cluster # autoscaling unless this annotation is set. @@ -559,7 +559,7 @@ spec: privileged: false containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -715,7 +715,7 @@ spec: labels: app: managed-prometheus-rule-evaluator app.kubernetes.io/name: rule-evaluator - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: # The emptyDir for the storage and config directories prevents cluster # autoscaling unless this annotation is set. @@ -740,7 +740,7 @@ spec: privileged: false containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -777,7 +777,7 @@ spec: - all privileged: false - name: evaluator - image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.0-gke.0 args: - --config.file=/prometheus/config_out/config.yaml - --web.listen-address=:19092 @@ -892,7 +892,7 @@ spec: labels: app: managed-prometheus-alertmanager app.kubernetes.io/name: alertmanager - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" components.gke.io/component-name: managed_prometheus @@ -947,7 +947,7 @@ spec: - all privileged: false - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/alertmanager/config.yaml - --config-file-output=/alertmanager/config_out/config.yaml diff --git a/manifests/rule-evaluator.yaml b/manifests/rule-evaluator.yaml index b7afeb02bc..ffac489f10 100644 --- a/manifests/rule-evaluator.yaml +++ b/manifests/rule-evaluator.yaml @@ -59,7 +59,7 @@ spec: metadata: labels: app.kubernetes.io/name: rule-evaluator - app.kubernetes.io/version: 0.6.3 + app.kubernetes.io/version: 0.7.0 spec: serviceAccountName: rule-evaluator automountServiceAccountToken: true @@ -72,7 +72,7 @@ spec: mountPath: /prometheus/config_out containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.0-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -106,7 +106,7 @@ spec: - all privileged: false - name: evaluator - image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.6.3-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.0-gke.0 args: - "--config.file=/prometheus/config_out/config.yaml" - "--web.listen-address=:9092" diff --git a/pkg/export/export.go b/pkg/export/export.go index 10f046e3ee..c4cd90ff20 100644 --- a/pkg/export/export.go +++ b/pkg/export/export.go @@ -478,7 +478,7 @@ func (e *Exporter) triggerNext() { // ClientName and Version are used to identify to User Agent. TODO(maxamin): automate versioning. const ( ClientName = "prometheus-engine-export" - Version = "0.6.3" + Version = "0.7.0" ) // Run sends exported samples to Google Cloud Monitoring. Must be called at most once.