Merge pull request #915 from humio/mike/default_chart_tag_appversion

helm: Update Deployment to use appVersion from Chart.yaml by default
humio · Feb 12, 2025 · 68834b8 · 68834b8
2 parents 76d4b7b + 40a1d72
commit 68834b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/charts/humio-operator/templates/operator-deployment.yaml b/charts/humio-operator/templates/operator-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     productID: "none"
     productName: "humio-operator"
-    productVersion: {{ .Values.operator.image.tag | quote }}
+    productVersion: "{{ .Values.operator.image.tag | default .Chart.AppVersion }}"
   labels:
     {{- include "humio.labels" . | nindent 4 }}
 spec:
@@ -23,7 +23,7 @@ spec:
       annotations:
         productID: "none"
         productName: "humio-operator"
-        productVersion: {{ .Values.operator.image.tag | quote }}
+        productVersion: "{{ .Values.operator.image.tag | default .Chart.AppVersion }}"
 {{- if .Values.operator.podAnnotations }}
         {{- toYaml .Values.operator.podAnnotations | nindent 8 }}
 {{- end }}
@@ -49,7 +49,7 @@ spec:
       serviceAccountName: {{ .Release.Name }}
       containers:
       - name: humio-operator
-        image: {{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag }}
+        image: "{{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
         command:
         - /manager

diff --git a/charts/humio-operator/values.yaml b/charts/humio-operator/values.yaml
@@ -1,7 +1,8 @@
 operator:
   image:
     repository: humio/humio-operator
-    tag: 0.27.1
+    # default for tag is the appVersion set in Chart.yaml
+    tag:
     pullPolicy: IfNotPresent
     pullSecrets: []
   prometheus: