[prometheus-stackdriver-exporter] Correct deployment annotations (#4907)

* [prometheus-stackdriver-exporter] Update Chart.yaml Signed-off-by: zeritti <[email protected]> * Correct annotations Signed-off-by: zeritti <[email protected]> * Add CI test case Signed-off-by: zeritti <[email protected]> --------- Signed-off-by: zeritti <[email protected]>
prometheus-community · Oct 10, 2024 · e68c764 · e68c764
1 parent 848f830
commit e68c764
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/charts/prometheus-stackdriver-exporter/Chart.yaml b/charts/prometheus-stackdriver-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Stackdriver exporter for Prometheus
 name: prometheus-stackdriver-exporter
-version: 4.6.1
+version: 4.6.2
 appVersion: v0.16.0
 home: https://www.stackdriver.com/
 sources:

diff --git a/charts/prometheus-stackdriver-exporter/ci/annotations-values.yaml b/charts/prometheus-stackdriver-exporter/ci/annotations-values.yaml
@@ -0,0 +1,19 @@
+---
+annotations:
+  foo.io/bar: qux
+  foo.io/baz: quux
+
+stackdriver:
+  serviceAccountKey: |
+    {
+      "type": "service_account",
+      "project_id": "dummy-acc",
+      "private_key_id": "00000000000000000000000000000000000",
+      "private_key": "",
+      "client_email": "[email protected]",
+      "client_id": "0000000000000000000000000",
+      "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+      "token_uri": "https://oauth2.googleapis.com/token",
+      "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+      "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/dummy%dummy-acc.iam.gserviceaccount.com"
+    }
diff --git a/charts/prometheus-stackdriver-exporter/templates/deployment.yaml b/charts/prometheus-stackdriver-exporter/templates/deployment.yaml
@@ -4,10 +4,10 @@ metadata:
   name: {{ template "stackdriver-exporter.fullname" . }}
   labels:
     {{- include "stackdriver-exporter.labels" . | indent 4 }}
-    {{- with .Values.annotations }}
-    annotations:
-      {{- toYaml .Values.annotations | indent 6 }}
-    {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -22,9 +22,9 @@ spec:
     metadata:
       labels:
         {{- include "stackdriver-exporter.labels" . | indent 8 }}
-      {{- if .Values.annotations }}
+      {{- with .Values.annotations }}
       annotations:
-        {{- toYaml .Values.annotations | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       {{- if .Values.securityContext }}