From 54fe5d47afe126f52310c14c86d33312b4aff216 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Tue, 9 Jul 2019 09:59:13 +0200
Subject: [PATCH] Fix missing mounts with non-persistent funkwhale

---
 charts/funkwhale/Chart.yaml                | 2 +-
 charts/funkwhale/templates/deployment.yaml | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/charts/funkwhale/Chart.yaml b/charts/funkwhale/Chart.yaml
index 82fa456..9d77858 100644
--- a/charts/funkwhale/Chart.yaml
+++ b/charts/funkwhale/Chart.yaml
@@ -4,4 +4,4 @@ appVersion: "0.19.1"
 description: A social platform to enjoy and share music
 icon: https://funkwhale.audio/favicon.png
 name: funkwhale
-version: 0.2.1
+version: 0.2.2
diff --git a/charts/funkwhale/templates/deployment.yaml b/charts/funkwhale/templates/deployment.yaml
index f530a8e..7fb17f9 100644
--- a/charts/funkwhale/templates/deployment.yaml
+++ b/charts/funkwhale/templates/deployment.yaml
@@ -54,7 +54,6 @@ spec:
               name: {{ include "funkwhale.fullname" . }}
           - secretRef:
               name: {{ include "funkwhale.fullname" . }}
-          {{- if or .Values.persistence.enabled .Values.api.extraVolumeMounts }}
           volumeMounts:
             - mountPath: /run/funkwhale
               name: funkwhale-sock
@@ -64,10 +63,9 @@ spec:
               name: frontend
             - name: data
               mountPath: /srv/funkwhale/data
-{{- if .Values.extraVolumeMounts }}
-{{ toYaml .Values.extraVolumeMounts | indent 12 }}
+{{- with .Values.extraVolumeMounts }}
+            {{ toYaml . | nindent 12 }}
 {{- end }}
-          {{- end }}
           resources:
             {{- toYaml .Values.api.resources | nindent 12 }}
         - name: nginx