From c46b8f0029226245c04a3fed93225e82a9ab3e57 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Mon, 24 Feb 2025 15:02:27 +0100 Subject: [PATCH] [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default (#32122) * [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Miguel Ruiz Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/valkey-cluster/CHANGELOG.md | 8 +++++-- bitnami/valkey-cluster/Chart.yaml | 2 +- bitnami/valkey-cluster/README.md | 2 +- .../templates/scripts-configmap.yaml | 4 ++-- .../templates/valkey-statefulset.yaml | 21 ++++++++++--------- bitnami/valkey-cluster/values.yaml | 4 ++-- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/bitnami/valkey-cluster/CHANGELOG.md b/bitnami/valkey-cluster/CHANGELOG.md index d21920882d..38f5758985 100644 --- a/bitnami/valkey-cluster/CHANGELOG.md +++ b/bitnami/valkey-cluster/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 2.1.3 (2025-02-20) +## 2.2.0 (2025-02-21) -* [bitnami/valkey-cluster] Release 2.1.3 ([#32066](https://github.com/bitnami/charts/pull/32066)) +* [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default ([#32122](https://github.com/bitnami/charts/pull/32122)) + +## 2.1.3 (2025-02-20) + +* [bitnami/valkey-cluster] Release 2.1.3 (#32066) ([6d565b3](https://github.com/bitnami/charts/commit/6d565b3a18fd2efee3764e826503fdb29b91e75b)), closes [#32066](https://github.com/bitnami/charts/issues/32066) ## 2.1.2 (2025-02-17) diff --git a/bitnami/valkey-cluster/Chart.yaml b/bitnami/valkey-cluster/Chart.yaml index 2f176eed99..4774f8d566 100644 --- a/bitnami/valkey-cluster/Chart.yaml +++ b/bitnami/valkey-cluster/Chart.yaml @@ -33,4 +33,4 @@ name: valkey-cluster sources: - https://github.com/bitnami/charts/tree/main/bitnami/valkey-cluster - https://github.com/bitnami/containers/tree/main/bitnami/vakey-cluster -version: 2.1.3 +version: 2.2.0 diff --git a/bitnami/valkey-cluster/README.md b/bitnami/valkey-cluster/README.md index 4f62e885d0..242e1facdd 100644 --- a/bitnami/valkey-cluster/README.md +++ b/bitnami/valkey-cluster/README.md @@ -459,7 +459,7 @@ OK | `password` | Valkey password (ignored if existingSecret set) | `""` | | `existingSecret` | Name of existing secret object (for password authentication) | `""` | | `existingSecretPasswordKey` | Name of key containing password to be retrieved from the existing secret | `""` | -| `usePasswordFile` | Mount passwords as files instead of environment variables | `false` | +| `usePasswordFiles` | Mount passwords as files instead of environment variables | `true` | | `tls.enabled` | Enable TLS support for replication traffic | `false` | | `tls.authClients` | Require clients to authenticate or not | `true` | | `tls.autoGenerated` | Generate automatically self-signed TLS certificates | `false` | diff --git a/bitnami/valkey-cluster/templates/scripts-configmap.yaml b/bitnami/valkey-cluster/templates/scripts-configmap.yaml index 2db5b82dcf..82a759de6d 100644 --- a/bitnami/valkey-cluster/templates/scripts-configmap.yaml +++ b/bitnami/valkey-cluster/templates/scripts-configmap.yaml @@ -19,7 +19,7 @@ data: VALKEY_STATUS_FILE=/tmp/.valkey_cluster_check - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} password_aux=`cat ${VALKEY_PASSWORD_FILE}` export REDISCLI_AUTH=$password_aux {{- else }} @@ -81,7 +81,7 @@ data: #!/bin/sh set -e - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} password_aux=`cat ${VALKEY_PASSWORD_FILE}` export REDISCLI_AUTH=$password_aux {{- else }} diff --git a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml index 02736e7597..0f44b7376f 100644 --- a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml +++ b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml @@ -161,7 +161,7 @@ spec: secretKeyRef: name: {{ template "valkey-cluster.secretName" . }} key: {{ template "valkey-cluster.secretPasswordKey" . }} - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} - name: VALKEY_PASSWORD_FILE value: "/opt/bitnami/valkey/secrets/valkey-password" {{- else }} @@ -274,7 +274,7 @@ spec: volumeMounts: - name: scripts mountPath: /scripts - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} - name: valkey-password mountPath: /opt/bitnami/valkey/secrets/ {{- end }} @@ -319,7 +319,7 @@ spec: - /bin/bash - -c - | - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" {{- end }} redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} @@ -331,16 +331,17 @@ spec: value: {{ template "common.names.fullname" . }} - name: REDIS_ADDR value: {{ printf "%s://127.0.0.1:%g" (ternary "rediss" "redis" .Values.tls.enabled) .Values.valkey.containerPorts.valkey | quote }} - {{- if and .Values.usePassword (not .Values.usePasswordFile) }} + {{- if .Values.usePassword }} + {{- if .Values.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/valkey/secrets/valkey-password" + {{- else }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: name: {{ template "valkey-cluster.secretName" . }} key: {{ template "valkey-cluster.secretPasswordKey" . }} {{- end }} - {{- if .Values.usePasswordFile }} - - name: REDIS_PASSWORD_FILE - value: "/opt/bitnami/valkey/secrets/valkey-password" {{- end }} {{- if .Values.tls.enabled }} - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE @@ -355,12 +356,12 @@ spec: {{- if .Values.metrics.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} {{- end }} - {{- if or .Values.usePasswordFile .Values.tls.enabled }} + {{- if or .Values.usePasswordFiles .Values.tls.enabled }} volumeMounts: - name: empty-dir mountPath: /tmp subPath: tmp-dir - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} - name: valkey-password mountPath: /opt/bitnami/valkey/secrets/ {{- end }} @@ -437,7 +438,7 @@ spec: configMap: name: {{ include "common.names.fullname" . }}-scripts defaultMode: 0755 - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} - name: valkey-password secret: secretName: {{ include "valkey-cluster.secretName" . }} diff --git a/bitnami/valkey-cluster/values.yaml b/bitnami/valkey-cluster/values.yaml index 574663771f..e8f40365c1 100644 --- a/bitnami/valkey-cluster/values.yaml +++ b/bitnami/valkey-cluster/values.yaml @@ -265,9 +265,9 @@ existingSecret: "" ## @param existingSecretPasswordKey Name of key containing password to be retrieved from the existing secret ## existingSecretPasswordKey: "" -## @param usePasswordFile Mount passwords as files instead of environment variables +## @param usePasswordFiles Mount passwords as files instead of environment variables ## -usePasswordFile: false +usePasswordFiles: true ## ## TLS configuration ##