[bitnami/valkey-cluster] Fix env-vars for metrics container (#28885)

* [bitnami/valkey-cluster] Fix env-vars for metrics container

Signed-off-by: Andrés Bono <andresbono@vmware.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: Andrés Bono <andresbono@vmware.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Andrés Bono
2024-08-19 12:24:34 +02:00
committed by GitHub
parent 9da9f3b33f
commit 1df2599056
3 changed files with 17 additions and 13 deletions

View File

@@ -1,8 +1,12 @@
# Changelog
## 0.1.8 (2024-07-31)
## 0.1.9 (2024-08-14)
* [bitnami/valkey-cluster] Release 0.1.8 ([#28609](https://github.com/bitnami/charts/pull/28609))
* [bitnami/valkey-cluster] Fix env-vars for metrics container ([#28885](https://github.com/bitnami/charts/pull/28885))
## <small>0.1.8 (2024-07-31)</small>
* [bitnami/valkey-cluster] Release 0.1.8 (#28609) ([449f0fc](https://github.com/bitnami/charts/commit/449f0fcc372bd0a5e0eff5fb36acf34956143fd9)), closes [#28609](https://github.com/bitnami/charts/issues/28609)
## <small>0.1.7 (2024-07-29)</small>

View File

@@ -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: 0.1.8
version: 0.1.9

View File

@@ -320,37 +320,37 @@ spec:
- -c
- |
{{- if .Values.usePasswordFile }}
export VALKEY_PASSWORD="$(< "${VALKEY_PASSWORD_FILE}")"
export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")"
{{- end }}
valkey_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }}
redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }}
{{- end }}
env:
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}
- name: VALKEY_ALIAS
- name: REDIS_ALIAS
value: {{ template "common.names.fullname" . }}
- name: VALKEY_ADDR
- name: REDIS_ADDR
value: {{ printf "%s://127.0.0.1:%g" (ternary "valkeys" "valkey" .Values.tls.enabled) .Values.valkey.containerPorts.valkey | quote }}
{{- if and .Values.usePassword (not .Values.usePasswordFile) }}
- name: VALKEY_PASSWORD
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "valkey-cluster.secretName" . }}
key: {{ template "valkey-cluster.secretPasswordKey" . }}
{{- end }}
{{- if .Values.usePasswordFile }}
- name: VALKEY_PASSWORD_FILE
- name: REDIS_PASSWORD_FILE
value: "/opt/bitnami/valkey/secrets/valkey-password"
{{- end }}
{{- if .Values.tls.enabled }}
- name: VALKEY_EXPORTER_TLS_CLIENT_KEY_FILE
- name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE
value: {{ template "valkey-cluster.tlsCertKey" . }}
- name: VALKEY_EXPORTER_TLS_CLIENT_CERT_FILE
- name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE
value: {{ template "valkey-cluster.tlsCert" . }}
- name: VALKEY_EXPORTER_TLS_CA_CERT_FILE
- name: REDIS_EXPORTER_TLS_CA_CERT_FILE
value: {{ template "valkey-cluster.tlsCACert" . }}
{{- end }}
- name: VALKEY_EXPORTER_WEB_LISTEN_ADDRESS
- name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
value: {{ printf ":%v" .Values.metrics.containerPorts.http }}
{{- if .Values.metrics.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}