From ca8d5886a1bc0fb37d1bc770ad2333acdffd7996 Mon Sep 17 00:00:00 2001 From: Andrew Horvath <99082305+ak3io@users.noreply.github.com> Date: Mon, 30 May 2022 19:20:18 +0200 Subject: [PATCH] [bitnami/common] use -d flag for base64 (#10491) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix #10486 Signed-off-by: Andrew Horvath * Update Chart.yaml Signed-off-by: Carlos Rodriguez Hernandez Co-authored-by: Carlos Rodríguez Hernández --- bitnami/common/Chart.yaml | 4 ++-- bitnami/common/README.md | 4 ++-- bitnami/common/templates/_utils.tpl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml index 722b70f93e..3f8683a01d 100644 --- a/bitnami/common/Chart.yaml +++ b/bitnami/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure apiVersion: v2 # Please make sure that version and appVersion are always the same. -appVersion: 1.13.1 +appVersion: 1.14.2 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself. home: https://github.com/bitnami/charts/tree/master/bitnami/common icon: https://bitnami.com/downloads/logos/bitnami-mark.png @@ -20,4 +20,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 1.14.1 +version: 1.14.2 diff --git a/bitnami/common/README.md b/bitnami/common/README.md index a98aab377b..3650fb1dcd 100644 --- a/bitnami/common/README.md +++ b/bitnami/common/README.md @@ -300,11 +300,11 @@ If we force those values to be empty we will see some alerts $ helm install test mychart --set path.to.value00="",path.to.value01="" 'path.to.value00' must not be empty, please add '--set path.to.value00=$PASSWORD_00' to the command. To get the current value: - export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 --decode) + export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 -d) 'path.to.value01' must not be empty, please add '--set path.to.value01=$PASSWORD_01' to the command. To get the current value: - export PASSWORD_01=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-01}" | base64 --decode) + export PASSWORD_01=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-01}" | base64 -d) ``` ## Upgrading diff --git a/bitnami/common/templates/_utils.tpl b/bitnami/common/templates/_utils.tpl index ea083a249f..8c22b2a383 100644 --- a/bitnami/common/templates/_utils.tpl +++ b/bitnami/common/templates/_utils.tpl @@ -6,7 +6,7 @@ Usage: */}} {{- define "common.utils.secret.getvalue" -}} {{- $varname := include "common.utils.fieldToEnvVar" . -}} -export {{ $varname }}=$(kubectl get secret --namespace {{ .context.Release.Namespace | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 --decode) +export {{ $varname }}=$(kubectl get secret --namespace {{ .context.Release.Namespace | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 -d) {{- end -}} {{/*