From 1fe78b90b9a001b5ffce59236084cbcebe8242f2 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 27 Sep 2021 06:14:54 +0200
Subject: [PATCH] funkwhale: Improve djangoSecret handling

---
 charts/funkwhale/Chart.yaml            | 2 +-
 charts/funkwhale/templates/secret.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/funkwhale/Chart.yaml b/charts/funkwhale/Chart.yaml
index 0b9dda7..f05af14 100644
--- a/charts/funkwhale/Chart.yaml
+++ b/charts/funkwhale/Chart.yaml
@@ -4,7 +4,7 @@ appVersion: "1.1.2"
 description: A social platform to enjoy and share music
 icon: https://funkwhale.audio/favicon.png
 name: funkwhale
-version: 0.4.0
+version: 0.4.1
 
 dependencies:
 - name: redis
diff --git a/charts/funkwhale/templates/secret.yaml b/charts/funkwhale/templates/secret.yaml
index 77f68a6..73edf38 100644
--- a/charts/funkwhale/templates/secret.yaml
+++ b/charts/funkwhale/templates/secret.yaml
@@ -13,7 +13,7 @@ data:
   CACHE_URL: {{ include "funkwhale.redisUrl" . | b64enc }}
   DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }}
   {{ if $secret -}}
-  DJANGO_SECRET_KEY: {{ $secret.data.DJANGO_SECRET_KEY }}
+  DJANGO_SECRET_KEY: {{ (.Values.djangoSecret | default (b64dec $secret.data.DJANGO_SECRET_KEY)) | b64enc }}
   {{ else -}}
   DJANGO_SECRET_KEY: {{ (.Values.djangoSecret | default uuidv4) | b64enc }}
   {{ end }}