mirror of
https://github.com/bitnami/charts.git
synced 2026-03-29 16:27:11 +08:00
[bitnami/valkey-cluster] Set usePasswordFiles=true by default (#32122)
* [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -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 }}
|
||||
|
||||
@@ -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" . }}
|
||||
|
||||
Reference in New Issue
Block a user