From 9524a79501c5ad6b5caa851b1fff8ca318d02c9c Mon Sep 17 00:00:00 2001
From: Florian Piesche <florian@yellowkeycard.net>
Date: Tue, 9 Mar 2021 02:37:36 +0000
Subject: [PATCH 1/3] Allow passing in external redis host

---
 charts/funkwhale/templates/_helpers.tpl | 2 +-
 charts/funkwhale/values.yaml            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/funkwhale/templates/_helpers.tpl b/charts/funkwhale/templates/_helpers.tpl
index d9c8384..107de14 100644
--- a/charts/funkwhale/templates/_helpers.tpl
+++ b/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.port }}/0
 {{- end -}}
 
 {{/*
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index 28a5509..188325a 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -56,7 +56,8 @@ redis:
     persistence:
       enabled: false
   password: funkwhale
-  redisPort: 6379
+  port: 6379
+  host: {{ template "funkwhale.fullname" . }}-redis-master
 
 djangoSecret: ''
 

From 75b397b3a850e2706774076b4cce21061f880cbf Mon Sep 17 00:00:00 2001
From: Florian Piesche <florian@yellowkeycard.net>
Date: Tue, 9 Mar 2021 02:38:01 +0000
Subject: [PATCH 2/3] Fix extraVolumeMounts for api pod

---
 charts/funkwhale/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/funkwhale/templates/deployment.yaml b/charts/funkwhale/templates/deployment.yaml
index d8b4b33..6fbf379 100644
--- a/charts/funkwhale/templates/deployment.yaml
+++ b/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:

From dacb080c78de69e2c2321c3b90c41733dfebb74a Mon Sep 17 00:00:00 2001
From: Florian Piesche <florian@yellowkeycard.net>
Date: Sun, 14 Mar 2021 21:54:04 +0000
Subject: [PATCH 3/3] Fix redisPort

---
 charts/funkwhale/templates/_helpers.tpl | 2 +-
 charts/funkwhale/values.yaml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/funkwhale/templates/_helpers.tpl b/charts/funkwhale/templates/_helpers.tpl
index 107de14..46d57eb 100644
--- a/charts/funkwhale/templates/_helpers.tpl
+++ b/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 }}@{{ .Values.redis.host }}:{{ .Values.redis.port }}/0
+redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
 {{- end -}}
 
 {{/*
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index 188325a..45e85c4 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -56,7 +56,7 @@ redis:
     persistence:
       enabled: false
   password: funkwhale
-  port: 6379
+  redisPort: 6379
   host: {{ template "funkwhale.fullname" . }}-redis-master
 
 djangoSecret: ''