Add back support for .image.tag Helm value but default to empty and t…

…hen set .Chart.AppVersion instead
giantswarm · Nov 7, 2024 · ac0243c · ac0243c
1 parent 7f4f99e
commit ac0243c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/helm/app-operator/templates/_helpers.tpl b/helm/app-operator/templates/_helpers.tpl
@@ -34,3 +34,14 @@ Selector labels
 app.kubernetes.io/name: {{ include "name" . | quote }}
 app.kubernetes.io/instance: {{ .Release.Name | quote }}
 {{- end -}}
+
+{{/*
+Define image tag.
+*/}}
+{{- define "image.tag" -}}
+{{- if .Values.image.tag }}
+{{- .Values.image.tag }}
+{{- else }}
+{{- .Chart.AppVersion }}
+{{- end }}
+{{- end }}
diff --git a/helm/app-operator/templates/deployment.yaml b/helm/app-operator/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
         {{- end }}
       containers:
       - name: {{ include "name" . }}
-        image: "{{ .Values.registry.domain }}/{{ .Values.image.repository }}:{{ .Chart.Version }}"
+        image: "{{ .Values.registry.domain }}/{{ .Values.image.repository }}:{{ include "image.tag" }}"
         volumeMounts:
         - name: {{ include "name" . }}-configmap
           mountPath: /var/run/{{ include "name" . }}/configmap/

diff --git a/helm/app-operator/values.yaml b/helm/app-operator/values.yaml
@@ -32,6 +32,7 @@ registry:
 
 image:
   repository: giantswarm/app-operator
+  tag: ""
 
 operatorkit:
   resyncPeriod: "5m"
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ registry: @@
     image:
       repository: giantswarm/app-operator
+      tag: ""
     operatorkit:
       resyncPeriod: "5m"
@@ Expand Down @@