funkwhale: Use app version as image tag

charts/funkwhale/Chart.yaml

@@ -4,4 +4,4 @@ appVersion: "0.21"
 description: A social platform to enjoy and share music
 icon: https://funkwhale.audio/favicon.png
 name: funkwhale
-version: 0.3.1
+version: 0.3.2

charts/funkwhale/templates/_helpers.tpl

@@ -38,3 +38,10 @@ Create chart name and version as used by the chart label.
 {{- define "funkwhale.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create the correct image tag name
+*/}}
+{{- define "funkwhale.imageTag" -}}
+{{- .Values.image.tag | default .Chart.AppVersion -}}
+{{- end -}}

charts/funkwhale/templates/deployment-celerybeat.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: celery-beat
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ include "funkwhale.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - sh

charts/funkwhale/templates/deployment-celeryworker.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: worker
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ include "funkwhale.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - sh

charts/funkwhale/templates/deployment.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: funkwhale
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ include "funkwhale.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - sh

charts/funkwhale/values.yaml

@@ -4,7 +4,7 @@
 ---
 image:
   repository: funkwhale/funkwhale
-  tag: 0.21
+  # tag:
   pullPolicy: IfNotPresent
 
 nameOverride: ""