From 4eb1f1bf29f427945cf53916caa40475b6365e8c Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 6 Mar 2023 22:54:38 +0100 Subject: [PATCH] fix(vaultwarden): don't base64 encode secret anymore --- charts/enterprise/vaultwarden/Chart.yaml | 2 +- charts/enterprise/vaultwarden/templates/_secrets.tpl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/enterprise/vaultwarden/Chart.yaml b/charts/enterprise/vaultwarden/Chart.yaml index dcb14a31a9a..f981a43864f 100644 --- a/charts/enterprise/vaultwarden/Chart.yaml +++ b/charts/enterprise/vaultwarden/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden - https://github.com/dani-garcia/vaultwarden type: application -version: 20.0.4 +version: 20.0.5 annotations: truecharts.org/catagories: | - security diff --git a/charts/enterprise/vaultwarden/templates/_secrets.tpl b/charts/enterprise/vaultwarden/templates/_secrets.tpl index c63f401a965..a33f037cf71 100644 --- a/charts/enterprise/vaultwarden/templates/_secrets.tpl +++ b/charts/enterprise/vaultwarden/templates/_secrets.tpl @@ -3,17 +3,17 @@ {{- $adminToken := "" }} {{- if eq .Values.vaultwarden.admin.enabled true }} -{{- $adminToken = .Values.vaultwarden.admin.token | default (randAlphaNum 48) | b64enc | quote }} +{{- $adminToken = .Values.vaultwarden.admin.token | default (randAlphaNum 48) | quote }} {{- end -}} {{- $smtpUser := "" }} {{- if and (eq .Values.vaultwarden.smtp.enabled true ) (.Values.vaultwarden.smtp.user) }} -{{- $smtpUser = .Values.vaultwarden.smtp.user | b64enc | quote }} +{{- $smtpUser = .Values.vaultwarden.smtp.user | quote }} {{- end -}} {{- $yubicoClientId := "" }} {{- if eq .Values.vaultwarden.yubico.enabled true }} -{{- $yubicoClientId = required "Yubico Client ID required" .Values.vaultwarden.yubico.clientId | toString | b64enc | quote }} +{{- $yubicoClientId = required "Yubico Client ID required" .Values.vaultwarden.yubico.clientId | toString | quote }} {{- end -}} enabled: true data: @@ -23,10 +23,10 @@ data: {{- end }} {{- if ne $smtpUser "" }} SMTP_USERNAME: {{ $smtpUser }} - SMTP_PASSWORD: {{ required "Must specify SMTP password" .Values.vaultwarden.smtp.password | b64enc | quote }} + SMTP_PASSWORD: {{ required "Must specify SMTP password" .Values.vaultwarden.smtp.password | quote }} {{- end }} {{- if ne $yubicoClientId "" }} YUBICO_CLIENT_ID: {{ $yubicoClientId }} - YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | b64enc | quote }} + YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | quote }} {{- end }} {{- end -}}