Merge branch 'main' into main

prometheus-community · Nov 6, 2023 · aab498b · aab498b
2 parents 6c8d2ef + d3b3006
commit aab498b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/charts/prometheus-stackdriver-exporter/Chart.yaml b/charts/prometheus-stackdriver-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Stackdriver exporter for Prometheus
 name: prometheus-stackdriver-exporter
-version: 4.3.1
-appVersion: 0.13.0
+version: 4.4.0
+appVersion: v0.14.1
 home: https://www.stackdriver.com/
 sources:
   - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-stackdriver-exporter

diff --git a/charts/prometheus-stackdriver-exporter/templates/deployment.yaml b/charts/prometheus-stackdriver-exporter/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["stackdriver_exporter"]
           volumeMounts:

diff --git a/charts/prometheus-stackdriver-exporter/values.yaml b/charts/prometheus-stackdriver-exporter/values.yaml
@@ -12,7 +12,8 @@ restartPolicy: Always
 
 image:
   repository: prometheuscommunity/stackdriver-exporter
-  tag: v0.13.0
+  # if not set appVersion field from Chart.yaml is used
+  tag: ""
   pullPolicy: IfNotPresent
 
   ## Optionally specify an array of imagePullSecrets.