From 185f73bd946a07f97a141871e7f904fa50ada03f Mon Sep 17 00:00:00 2001
From: Andrey Voronkov <voronkovaa@gmail.com>
Date: Thu, 26 Aug 2021 11:58:29 +0300
Subject: [PATCH] keydb: 0.24.0

---
 keydb/Chart.yaml                  |  4 ++--
 keydb/README.md                   |  2 +-
 keydb/templates/secret-utils.yaml | 26 +++++++++++++-------------
 keydb/values.yaml                 |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/keydb/Chart.yaml b/keydb/Chart.yaml
index 919aca6..806a747 100644
--- a/keydb/Chart.yaml
+++ b/keydb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: keydb
 description: A Helm chart for KeyDB multimaster setup
 type: application
-version: 0.23.0
+version: 0.24.0
 keywords:
 - keydb
 - redis
@@ -20,4 +20,4 @@ sources:
 - https://github.com/Enapter/charts
 - https://github.com/JohnSully/KeyDB
 icon: https://keydb.dev/assets/ico/keydb_logo_bwtxtw.png
-appVersion: 6.0.18
+appVersion: 6.2.0
diff --git a/keydb/README.md b/keydb/README.md
index 8c3b2e0..8d6479f 100644
--- a/keydb/README.md
+++ b/keydb/README.md
@@ -32,7 +32,7 @@ The following table lists the configurable parameters of the KeyDB chart and the
 
 | Parameter                       | Description                                        | Default                                   |
 |:--------------------------------|:---------------------------------------------------|:------------------------------------------|
-| `image`                         | KeyDB docker image                                 | `eqalpha/keydb:x86_64_v6.0.18`            |
+| `image`                         | KeyDB docker image                                 | `eqalpha/keydb:x86_64_v6.2.0`             |
 | `imagePullPolicy`               | K8s imagePullPolicy                                | `IfNotPresent`                            |
 | `nodes`                         | Number of KeyDB master pods                        | `3`                                       |
 | `password`                      | If enabled KeyDB servers are password-protected    | `""`                                      |
diff --git a/keydb/templates/secret-utils.yaml b/keydb/templates/secret-utils.yaml
index 944b268..ef815f1 100644
--- a/keydb/templates/secret-utils.yaml
+++ b/keydb/templates/secret-utils.yaml
@@ -14,28 +14,28 @@ stringData:
     port="6379"
     replicas=()
     for node in {0..{{ (sub (.Values.nodes | int) 1) }}}; do
-      if [ "$host" != "{{ include "keydb.fullname" . }}-${node}" ]; then
+      if [ "${host}" != "{{ include "keydb.fullname" . }}-${node}" ]; then
           replicas+=("--replicaof {{ include "keydb.fullname" . }}-${node}.{{ include "keydb.fullname" . }}-headless ${port}")
       fi
     done
     exec keydb-server /etc/keydb/redis.conf \
-        --active-replica {{ .Values.activeReplicas }} \
-        --multi-master {{ .Values.multiMaster }} \
-        --appendonly {{ .Values.appendonly }} \
-        --bind 0.0.0.0 \
-        --port "$port" \
-        --protected-mode {{ .Values.protectedMode }} \
-        --server-threads {{ .Values.threads | int }} \
+        --active-replica {{ .Values.activeReplicas | quote }} \
+        --multi-master {{ .Values.multiMaster | quote }} \
+        --appendonly {{ .Values.appendonly | quote }} \
+        --bind "0.0.0.0" \
+        --port "${port}" \
+        --protected-mode {{ .Values.protectedMode | quote }} \
+        --server-threads {{ .Values.threads | quote }} \
 {{- if .Values.existingSecret }}
-        --masterauth $REDIS_PASSWORD \
-        --requirepass $REDIS_PASSWORD \
+        --masterauth "${REDIS_PASSWORD}" \
+        --requirepass "${REDIS_PASSWORD}" \
 {{- else if .Values.password }}
-        --masterauth {{ .Values.password }} \
-        --requirepass {{ .Values.password }} \
+        --masterauth {{ .Values.password | quote }} \
+        --requirepass {{ .Values.password | quote }} \
 {{- end }}
       {{- range $key, $value := .Values.configExtraArgs }}
         {{- if $value }}
-        --{{ $key }} {{ $value }} \
+        --{{ $key }} {{ $value | quote }} \
         {{- else }}
         --{{ $key }} \
         {{- end }}
diff --git a/keydb/values.yaml b/keydb/values.yaml
index 90ffbc4..4d1bbee 100644
--- a/keydb/values.yaml
+++ b/keydb/values.yaml
@@ -1,7 +1,7 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image: eqalpha/keydb:x86_64_v6.0.18
+image: eqalpha/keydb:x86_64_v6.2.0
 imagePullPolicy: IfNotPresent
 
 nodes: 3