From bbb1fe6345e5b2bc1e2af2c18ddc63bf7562caf8 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sun, 1 Jan 2023 00:10:33 +0200 Subject: [PATCH] fix(meshcentral): don't double encode new generated keys (#5917) --- charts/stable/meshcentral/Chart.yaml | 2 +- charts/stable/meshcentral/templates/_secret.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/stable/meshcentral/Chart.yaml b/charts/stable/meshcentral/Chart.yaml index 98405ee5245..64e7c23187d 100644 --- a/charts/stable/meshcentral/Chart.yaml +++ b/charts/stable/meshcentral/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: meshcentral -version: 9.0.24 +version: 9.0.25 appVersion: "1.1.2" description: MeshCentral is a full computer management web site type: application diff --git a/charts/stable/meshcentral/templates/_secret.tpl b/charts/stable/meshcentral/templates/_secret.tpl index 002192eb66c..d75108502e5 100644 --- a/charts/stable/meshcentral/templates/_secret.tpl +++ b/charts/stable/meshcentral/templates/_secret.tpl @@ -32,7 +32,7 @@ {{- with (lookup "v1" "Secret" .Release.Namespace $secretStorageName) -}} {{- $sessionKey = (index .data "session_key") | b64dec -}} {{- else -}} - {{- $sessionKey = randAlphaNum 32 | b64enc -}} + {{- $sessionKey = randAlphaNum 32 -}} {{- end -}} {{/* Inject some values */}} @@ -89,7 +89,7 @@ metadata: data: {{/* The actual config */}} config.json: | - {{- toPrettyJson (fromYaml $config) | b64enc |nindent 4 }} + {{- toPrettyJson (fromYaml $config) | b64enc | nindent 4 }} {{- end -}} {{/* Prunes keys that start with _ */}}