From ae63bcea405c196c36107b09285e6b6b1c4af84d Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 22 Feb 2022 12:24:26 +0200
Subject: [PATCH] fix(monica): only b64enc the key once (#1930)

* fix(monica): only b64enc the key once

* Restore description

* Update _appkey.tpl

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
---
 charts/stable/monica/Chart.yaml            |  2 +-
 charts/stable/monica/templates/_appkey.tpl | 17 ++++++++---------
 charts/stable/monica/templates/common.yaml |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/charts/stable/monica/Chart.yaml b/charts/stable/monica/Chart.yaml
index 0019ddbdd3e..2d80942d139 100644
--- a/charts/stable/monica/Chart.yaml
+++ b/charts/stable/monica/Chart.yaml
@@ -22,7 +22,7 @@ name: monica
 sources:
 - https://github.com/monicahq/monica
 - https://hub.docker.com/_/monica
-version: 0.0.43
+version: 0.0.44
 annotations:
   truecharts.org/catagories: |
     - crm
diff --git a/charts/stable/monica/templates/_appkey.tpl b/charts/stable/monica/templates/_appkey.tpl
index fc53fdeb80c..d504d2edc9c 100644
--- a/charts/stable/monica/templates/_appkey.tpl
+++ b/charts/stable/monica/templates/_appkey.tpl
@@ -1,23 +1,22 @@
 {{/*
-This template generates a random password and ensures it persists across updates/edits to the chart
+This template generates a random appkey and ensures it persists across updates/edits to the chart
 */}}
 {{- define "monica.appkey" -}}
 ---
 apiVersion: v1
 kind: Secret
+type: Opaque
 metadata:
+  name: appkey
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  name: appkey
 {{- $keyprevious := lookup "v1" "Secret" .Release.Namespace "appkey" }}
 {{- $appkey := "" }}
 data:
-{{- if $keyprevious }}
-  {{- $appkey = ( index $keyprevious.data "appkey" ) | b64dec  }}
+  {{- if $keyprevious }}
   appkey: {{ ( index $keyprevious.data "appkey" ) }}
-{{- else }}
-  {{- $appkey = randAlphaNum 32 | b64enc }}
-  appkey: {{ $appkey | b64enc | quote }}
-{{- end }}
-type: Opaque
+  {{- else }}
+  {{- $appkey = randAlphaNum 32 }}
+  appkey: {{ $appkey | b64enc }}
+  {{- end }}
 {{- end -}}
diff --git a/charts/stable/monica/templates/common.yaml b/charts/stable/monica/templates/common.yaml
index c209b745621..166b81aa266 100644
--- a/charts/stable/monica/templates/common.yaml
+++ b/charts/stable/monica/templates/common.yaml
@@ -4,6 +4,5 @@
 {{/* Render appkey for monica */}}
 {{- include "monica.appkey" . }}
 
-
 {{/* Render the templates */}}
 {{ include "common.postSetup" . }}