From 0a92feeb0997968eb1d505a0017d9da11e845728 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 31 Aug 2021 14:56:56 +0200
Subject: [PATCH] Fix databases on fireflyiii and vaultwarden

---
 charts/stable/fireflyiii/Chart.yaml              | 2 +-
 charts/stable/fireflyiii/templates/_secrets.tpl  | 6 +++---
 charts/stable/vaultwarden/Chart.yaml             | 2 +-
 charts/stable/vaultwarden/templates/_secrets.tpl | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml
index 5c0e54f23f7..f408ea52302 100644
--- a/charts/stable/fireflyiii/Chart.yaml
+++ b/charts/stable/fireflyiii/Chart.yaml
@@ -27,4 +27,4 @@ name: fireflyiii
 sources:
 - https://github.com/firefly-iii/firefly-iii/
 type: application
-version: 6.0.7
+version: 6.0.8
diff --git a/charts/stable/fireflyiii/templates/_secrets.tpl b/charts/stable/fireflyiii/templates/_secrets.tpl
index 1c9f0103a95..5fc10eee87b 100644
--- a/charts/stable/fireflyiii/templates/_secrets.tpl
+++ b/charts/stable/fireflyiii/templates/_secrets.tpl
@@ -5,12 +5,12 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-dbcreds
-{{- $previous := lookup "v1" "Secret" .Release.Namespace ( ( printf "%v-%v"  .Release.Name "dbcreds" ) | quote ) }}
+  {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
+  name: $dbcredsname
+{{- $previous := lookup "v1" "Secret" .Release.Namespace $dbcredsname }}
 {{- $dbPass := "" }}
 data:
 {{- if $previous }}
-  {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec  }}
   postgresql-password: {{ ( index $previous.data "postgresql-password" ) }}
   postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }}
 {{- else }}
diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 88307b0aa90..28da6512468 100644
--- a/charts/stable/vaultwarden/Chart.yaml
+++ b/charts/stable/vaultwarden/Chart.yaml
@@ -31,4 +31,4 @@ name: vaultwarden
 sources:
 - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 5.0.7
+version: 5.0.8
diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl
index 1cb019e48f3..1cc2c78ac7c 100644
--- a/charts/stable/vaultwarden/templates/_secrets.tpl
+++ b/charts/stable/vaultwarden/templates/_secrets.tpl
@@ -41,12 +41,12 @@ kind: Secret
 metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  name: {{ .Release.Name }}-dbcreds
-{{- $previous := lookup "v1" "Secret" .Release.Namespace ( ( printf "%v-%v"  .Release.Name "dbcreds" ) | quote ) }}
+  {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
+  name: $dbcredsname
+{{- $previous := lookup "v1" "Secret" .Release.Namespace $dbcredsname }}
 {{- $dbPass := "" }}
 data:
 {{- if $previous }}
-  {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec  }}
   postgresql-password: {{ ( index $previous.data "postgresql-password" ) }}
   postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }}
 {{- else }}