From 600dc90456446e096cbff6dbc727dd92a4a1d10f Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Wed, 19 Mar 2025 16:08:52 -0400 Subject: [PATCH 1/9] Add support for replica templates to batch job Signed-off-by: Mike Brancato --- bitnami/valkey-cluster/templates/update-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/templates/update-cluster.yaml b/bitnami/valkey-cluster/templates/update-cluster.yaml index 379da54386c3e2..11db5aab785ca5 100644 --- a/bitnami/valkey-cluster/templates/update-cluster.yaml +++ b/bitnami/valkey-cluster/templates/update-cluster.yaml @@ -207,7 +207,7 @@ spec: value: {{ .Values.valkey.containerPorts.valkey | quote }} {{- end }} - name: VALKEY_CLUSTER_REPLICAS - value: {{ .Values.cluster.replicas | quote }} + value: {{ if eq (typeOf .Values.cluster.replicas) "float64" -}}{{ .Values.cluster.replicas | quote }}{{- else -}}{{ tpl .Values.cluster.replicas . | quote }}{{- end }} {{- if .Values.usePassword }} - name: REDISCLI_AUTH valueFrom: From 3524cdec244b59968ba574f0ccf22d8d7a37f916 Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Wed, 19 Mar 2025 16:10:28 -0400 Subject: [PATCH 2/9] Add support for replica templates Signed-off-by: Mike Brancato --- bitnami/valkey-cluster/templates/valkey-statefulset.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml index 0f44b7376f2e3f..23a51fce69fce9 100644 --- a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml +++ b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml @@ -20,7 +20,7 @@ spec: {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.valkey.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} - replicas: {{ .Values.cluster.nodes }} + replicas: {{ if eq (typeOf .Values.cluster.nodes) "float64" -}}{{ .Values.cluster.nodes }}{{- else -}}{{ tpl .Values.cluster.nodes . | int }}{{- end }} serviceName: {{ include "common.names.fullname" . }}-headless podManagementPolicy: {{ .Values.valkey.podManagementPolicy }} template: @@ -116,7 +116,7 @@ spec: {{- if .Values.cluster.init }} if [[ "$pod_index" == "0" ]]; then export VALKEY_CLUSTER_CREATOR="yes" - export VALKEY_CLUSTER_REPLICAS="{{ .Values.cluster.replicas }}" + export VALKEY_CLUSTER_REPLICAS="{{ if eq (typeOf .Values.cluster.replicas) "float64" -}}{{ .Values.cluster.replicas | quote }}{{- else -}}{{ tpl .Values.cluster.replicas . | int }}{{- end }}" fi {{- end }} /opt/bitnami/scripts/valkey-cluster/entrypoint.sh /opt/bitnami/scripts/valkey-cluster/run.sh @@ -133,7 +133,7 @@ spec: pod_index="${pod_index[-1]}" if [[ "$pod_index" == "0" ]]; then export VALKEY_CLUSTER_CREATOR="yes" - export VALKEY_CLUSTER_REPLICAS="{{ .Values.cluster.replicas }}" + export VALKEY_CLUSTER_REPLICAS="{{ if eq (typeOf .Values.cluster.replicas) "float64" -}}{{ .Values.cluster.replicas | quote }}{{- else -}}{{ tpl .Values.cluster.replicas . | int }}{{- end }}" fi {{- end }} /opt/bitnami/scripts/valkey-cluster/entrypoint.sh /opt/bitnami/scripts/valkey-cluster/run.sh From 4d2575d770d8022bd5a35dd5eb80f112ee69725d Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Wed, 19 Mar 2025 16:16:21 -0400 Subject: [PATCH 3/9] bump version Signed-off-by: Mike Brancato --- bitnami/valkey-cluster/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/Chart.yaml b/bitnami/valkey-cluster/Chart.yaml index b6e705b014a53e..223265fe151909 100644 --- a/bitnami/valkey-cluster/Chart.yaml +++ b/bitnami/valkey-cluster/Chart.yaml @@ -34,4 +34,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.2.0 +version: 2.2.1 From 61c8a5c727164951883cd801d4438aac9bf1be10 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 19 Mar 2025 20:18:50 +0000 Subject: [PATCH 4/9] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/valkey-cluster/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/valkey-cluster/CHANGELOG.md b/bitnami/valkey-cluster/CHANGELOG.md index 38f5758985ad70..82954cd21c2afe 100644 --- a/bitnami/valkey-cluster/CHANGELOG.md +++ b/bitnami/valkey-cluster/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 2.2.0 (2025-02-21) +## 2.2.1 (2025-03-19) -* [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default ([#32122](https://github.com/bitnami/charts/pull/32122)) +* [bitnami/valkey-cluster] Add support for templating node and replica values ([#32520](https://github.com/bitnami/charts/pull/32520)) + +## 2.2.0 (2025-02-24) + +* [bitnami/valkey-cluster] Set `usePasswordFiles=true` by default (#32122) ([c46b8f0](https://github.com/bitnami/charts/commit/c46b8f0029226245c04a3fed93225e82a9ab3e57)), closes [#32122](https://github.com/bitnami/charts/issues/32122) ## 2.1.3 (2025-02-20) From df134ba880e1439c78f11f9d952f36447c643ca9 Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Thu, 20 Mar 2025 00:23:39 -0400 Subject: [PATCH 5/9] add support to template resources and persistent storage Signed-off-by: Mike Brancato --- bitnami/valkey-cluster/templates/valkey-statefulset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml index 23a51fce69fce9..5ffd00a89ef7ff 100644 --- a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml +++ b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml @@ -267,7 +267,7 @@ spec: {{- end }} {{- end }} {{- if .Values.valkey.resources }} - resources: {{- toYaml .Values.valkey.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.valkey.resources "context" $) | nindent 12 }} {{- else if ne .Values.valkey.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.valkey.resourcesPreset) | nindent 12 }} {{- end }} @@ -492,7 +492,7 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistence.size | quote }} + storage: {{ tpl .Values.persistence.size . | quote }} {{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) | nindent 8 }} {{- if or .Values.persistence.matchLabels .Values.persistence.matchExpressions }} selector: From abccc6d72c7d11e4c0677ae831305b4305277acc Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Mar 2025 04:25:30 +0000 Subject: [PATCH 6/9] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/valkey-cluster/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/CHANGELOG.md b/bitnami/valkey-cluster/CHANGELOG.md index 82954cd21c2afe..e57d36476ed2d8 100644 --- a/bitnami/valkey-cluster/CHANGELOG.md +++ b/bitnami/valkey-cluster/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.1 (2025-03-19) +## 2.2.1 (2025-03-20) * [bitnami/valkey-cluster] Add support for templating node and replica values ([#32520](https://github.com/bitnami/charts/pull/32520)) From 482051579c85da735ccd71d1a74a64586e8943c3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Mar 2025 04:27:22 +0000 Subject: [PATCH 7/9] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/valkey-cluster/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/CHANGELOG.md b/bitnami/valkey-cluster/CHANGELOG.md index e57d36476ed2d8..3b41d6bc84b67f 100644 --- a/bitnami/valkey-cluster/CHANGELOG.md +++ b/bitnami/valkey-cluster/CHANGELOG.md @@ -2,7 +2,7 @@ ## 2.2.1 (2025-03-20) -* [bitnami/valkey-cluster] Add support for templating node and replica values ([#32520](https://github.com/bitnami/charts/pull/32520)) +* [bitnami/valkey-cluster] Add support for templating nodes, replicas, resources, and persistent storage values ([#32520](https://github.com/bitnami/charts/pull/32520)) ## 2.2.0 (2025-02-24) From 50e0fe3eb8960da22a6f9ebbbf936f7357491489 Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Thu, 20 Mar 2025 00:48:10 -0400 Subject: [PATCH 8/9] Fix nodes templating into env var Signed-off-by: Mike Brancato --- bitnami/valkey-cluster/templates/valkey-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml index 5ffd00a89ef7ff..da7b1fe4d07cf1 100644 --- a/bitnami/valkey-cluster/templates/valkey-statefulset.yaml +++ b/bitnami/valkey-cluster/templates/valkey-statefulset.yaml @@ -153,7 +153,7 @@ spec: value: "no" {{- else }} - name: VALKEY_NODES - value: "{{ $count := .Values.cluster.nodes | int }}{{ range $i, $v := until $count }}{{ include "common.names.fullname" $ }}-{{ $i }}.{{ template "common.names.fullname" $ }}-headless {{ end }}" + value: '{{- $count := 0 -}}{{ if eq (typeOf .Values.cluster.replicas) "float64" -}}{{ $count = .Values.cluster.nodes | int }}{{- else -}}{{ $count = tpl .Values.cluster.nodes . | int }}{{- end -}}{{ range $i, $v := until $count }}{{ include "common.names.fullname" $ }}-{{ $i }}.{{ template "common.names.fullname" $ }}-headless {{ end }}' {{- end }} {{- if .Values.usePassword }} - name: REDISCLI_AUTH From 1eb84e9b9383b16e91fe20522e3307e8decfbc5d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 21 Mar 2025 08:10:56 +0000 Subject: [PATCH 9/9] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/valkey-cluster/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/valkey-cluster/CHANGELOG.md b/bitnami/valkey-cluster/CHANGELOG.md index 3b41d6bc84b67f..36ae13c0720222 100644 --- a/bitnami/valkey-cluster/CHANGELOG.md +++ b/bitnami/valkey-cluster/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.1 (2025-03-20) +## 2.2.1 (2025-03-21) * [bitnami/valkey-cluster] Add support for templating nodes, replicas, resources, and persistent storage values ([#32520](https://github.com/bitnami/charts/pull/32520))