From e5bb28807beab52e92cf5c72fac27df3fa0d5971 Mon Sep 17 00:00:00 2001 From: Daniel Clark Date: Wed, 6 Sep 2023 12:50:19 -0400 Subject: [PATCH] bump image and api tags for 0.7.4 (#565) * bump image and api tags * nit example image version --- Makefile | 8 +++---- .../deploy/operator/05-deployment.yaml | 4 ++-- .../deploy/operator/10-collector.yaml | 6 ++--- .../deploy/operator/11-rule-evaluator.yaml | 6 ++--- .../deploy/operator/12-alertmanager.yaml | 6 ++--- .../deploy/rule-evaluator/01-deployment.yaml | 6 ++--- examples/frontend.yaml | 2 +- .../go-synthetic/go-synthetic.yaml | 2 +- examples/prometheus.yaml | 4 ++-- manifests/operator.yaml | 22 +++++++++---------- manifests/rule-evaluator.yaml | 6 ++--- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 0d164db485..e3b22088cf 100644 --- a/Makefile +++ b/Makefile @@ -165,10 +165,10 @@ presubmit: ## Regenerate all resources, build all images and run all tests. presubmit: updateversions regen bin test e2e .PHONY: updateversions -CURRENT_TAG = v0.7.1-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.7.1 +CURRENT_TAG = v0.7.4-gke.0 +CURRENT_PROM_TAG = v2.41.0-gmp.4-gke.1 +CURRENT_AM_TAG = v0.25.1-gmp.0-gke.1 +LABEL_API_VERSION = 0.7.4 FILES_TO_UPDATE = $(shell find . -type f -name "*.yaml" ! -name "kube-state-metrics.yaml" ! -name "node-exporter.yaml") updateversions: ## Modify all manifests, so it contains the expected versions. ## diff --git a/cmd/operator/deploy/operator/05-deployment.yaml b/cmd/operator/deploy/operator/05-deployment.yaml index 8cd072b2aa..077f0369f2 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.7.1 + app.kubernetes.io/version: 0.7.4 spec: serviceAccountName: operator automountServiceAccountToken: true priorityClassName: gmp-critical containers: - name: operator - image: gke.gcr.io/prometheus-engine/operator:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/operator:v0.7.4-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 2be03ee3a9..3beaedc938 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.7.1 + app.kubernetes.io/version: 0.7.4 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -88,7 +88,7 @@ spec: - all privileged: false - name: prometheus - image: gke.gcr.io/prometheus-engine/prometheus:v2.35.0-gmp.5-gke.0 + image: gke.gcr.io/prometheus-engine/prometheus:v2.41.0-gmp.4-gke.1 args: - --config.file=/prometheus/config_out/config.yaml - --enable-feature=exemplar-storage diff --git a/cmd/operator/deploy/operator/11-rule-evaluator.yaml b/cmd/operator/deploy/operator/11-rule-evaluator.yaml index de43a9a2e0..e6931a9e07 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.7.1 + app.kubernetes.io/version: 0.7.4 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.4-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 a53f763873..e8c1e55dc8 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.7.1 + app.kubernetes.io/version: 0.7.4 annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" components.gke.io/component-name: managed_prometheus @@ -62,7 +62,7 @@ spec: privileged: false containers: - name: alertmanager - image: gke.gcr.io/prometheus-engine/alertmanager:v0.24.0-gmp.3-gke.1 + image: gke.gcr.io/prometheus-engine/alertmanager:v0.25.1-gmp.0-gke.1 args: - --config.file=/alertmanager/config_out/config.yaml - --storage.path=/alertmanager-data @@ -97,7 +97,7 @@ spec: - all privileged: false - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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 7e318a310c..46a8f074bd 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.7.1 + app.kubernetes.io/version: 0.7.4 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.4-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 bc2605aea7..8c09174fcf 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/frontend:v0.7.4-gke.0 args: - "--web.listen-address=:9090" - "--query.project-id=$PROJECT_ID" diff --git a/examples/instrumentation/go-synthetic/go-synthetic.yaml b/examples/instrumentation/go-synthetic/go-synthetic.yaml index fe5ed91e6e..6f85d56a5e 100644 --- a/examples/instrumentation/go-synthetic/go-synthetic.yaml +++ b/examples/instrumentation/go-synthetic/go-synthetic.yaml @@ -29,7 +29,7 @@ spec: containers: - name: go-synthetic # TODO(bwplotka): Move to go-synthetic image once released. - image: "gcr.io/gke-release/prometheus-engine/example-app:v0.7.2-gke.0" + image: gke.gcr.io/prometheus-engine/example-app:v0.7.4-gke.0 args: - "--listen-address=:8080" - "--cpu-burn-ops=75" diff --git a/examples/prometheus.yaml b/examples/prometheus.yaml index dadd1a57fe..5a28279aaf 100644 --- a/examples/prometheus.yaml +++ b/examples/prometheus.yaml @@ -108,7 +108,7 @@ spec: privileged: false containers: - name: prometheus - image: gke.gcr.io/prometheus-engine/prometheus:v2.35.0-gmp.5-gke.0 + image: gke.gcr.io/prometheus-engine/prometheus:v2.41.0-gmp.4-gke.1 args: - --config.file=/prometheus/config_out/config.yaml - --storage.tsdb.path=/prometheus/data @@ -134,7 +134,7 @@ spec: - name: prometheus-db mountPath: /prometheus/data - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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 1e4c2fc867..450e4aa58c 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.7.1 + app.kubernetes.io/version: 0.7.4 spec: serviceAccountName: operator automountServiceAccountToken: true priorityClassName: gmp-critical containers: - name: operator - image: gke.gcr.io/prometheus-engine/operator:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/operator:v0.7.4-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.7.1 + app.kubernetes.io/version: 0.7.4 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -594,7 +594,7 @@ spec: - all privileged: false - name: prometheus - image: gke.gcr.io/prometheus-engine/prometheus:v2.35.0-gmp.5-gke.0 + image: gke.gcr.io/prometheus-engine/prometheus:v2.41.0-gmp.4-gke.1 args: - --config.file=/prometheus/config_out/config.yaml - --enable-feature=exemplar-storage @@ -708,7 +708,7 @@ spec: labels: app: managed-prometheus-rule-evaluator app.kubernetes.io/name: rule-evaluator - app.kubernetes.io/version: 0.7.1 + app.kubernetes.io/version: 0.7.4 annotations: # The emptyDir for the storage and config directories prevents cluster # autoscaling unless this annotation is set. @@ -733,7 +733,7 @@ spec: privileged: false containers: - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-gke.0 args: - --config-file=/prometheus/config/config.yaml - --config-file-output=/prometheus/config_out/config.yaml @@ -770,7 +770,7 @@ spec: - all privileged: false - name: evaluator - image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.4-gke.0 args: - --config.file=/prometheus/config_out/config.yaml - --web.listen-address=:19092 @@ -885,7 +885,7 @@ spec: labels: app: managed-prometheus-alertmanager app.kubernetes.io/name: alertmanager - app.kubernetes.io/version: 0.7.1 + app.kubernetes.io/version: 0.7.4 annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" components.gke.io/component-name: managed_prometheus @@ -906,7 +906,7 @@ spec: privileged: false containers: - name: alertmanager - image: gke.gcr.io/prometheus-engine/alertmanager:v0.24.0-gmp.3-gke.1 + image: gke.gcr.io/prometheus-engine/alertmanager:v0.25.1-gmp.0-gke.1 args: - --config.file=/alertmanager/config_out/config.yaml - --storage.path=/alertmanager-data @@ -941,7 +941,7 @@ spec: - all privileged: false - name: config-reloader - image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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 f6b13466c1..89983deefe 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.7.1 + app.kubernetes.io/version: 0.7.4 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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/config-reloader:v0.7.4-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.7.1-gke.0 + image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.7.4-gke.0 args: - "--config.file=/prometheus/config_out/config.yaml" - "--web.listen-address=:9092"