Merge branch 'master' into 'master'

Allow external redis service and fix API pod extra volume mounts.

See merge request ananace/charts!2

charts/funkwhale/templates/_helpers.tpl

@@ -11,7 +11,7 @@ postgres://{{ .Values.database.user}}:{{ .Values.database.password }}@{{ .Values
 {{- end -}}
 
 {{- define "funkwhale.redisUrl" -}}
-redis://:{{ .Values.redis.password }}@{{ template "funkwhale.fullname" . }}-redis-master:{{ .Values.redis.redisPort }}/0
+redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
 {{- end -}}
 
 {{/*

charts/funkwhale/templates/deployment.yaml

@@ -66,7 +66,7 @@ spec:
               name: frontend
             - name: data
               mountPath: /srv/funkwhale/data
-{{- with .Values.extraVolumeMounts }}
+{{- with .Values.api.extraVolumeMounts }}
             {{ toYaml . | nindent 12 }}
 {{- end }}
           resources:

charts/funkwhale/values.yaml

@@ -57,6 +57,7 @@ redis:
       enabled: false
   password: funkwhale
   redisPort: 6379
+  host: {{ template "funkwhale.fullname" . }}-redis-master
 
 djangoSecret: ''