Refactor existingSecretPasswordKey feature

keydb/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: keydb
 description: A Helm chart for KeyDB multimaster setup
 type: application
-version: 0.31.0
+version: 0.32.0
 keywords:
 - keydb
 - redis

keydb/README.md

@@ -77,7 +77,7 @@ The following table lists the configurable parameters of the KeyDB chart and the
 | `nodes`                         | Number of KeyDB master pods                        | `3`                                       |
 | `password`                      | If enabled KeyDB servers are password-protected    | `""`                                      |
 | `existingSecret`                | If enabled password is taken from secret           | `""`                                      |
-| `existingSecretPasswordKey`     | Secret key name. Default value password            | `""`
+| `existingSecretPasswordKey`     | Secret key name.                                   | `"password"`                              |
 | `port`                          | KeyDB service port clients connect to              | `6379`                                    |
 | `threads`                       | KeyDB server-threads per node                      | `2`                                       |
 | `multiMaster`                   | KeyDB multi-master setup                           | `yes`                                     |
@@ -127,7 +127,7 @@ The following table lists the configurable parameters of the KeyDB chart and the
 ## Using existingSecret
 
 When definining existingSecret (by default is "") password value is ignored. Password is taken from that secret, instead of being provided as plain text under values.yaml file. \
-Secret key must be *password*. \
+Secret key must be `existingSecretPasswordKey` (*password* by default). \
 Example of of such secret: 
 ```bash
 kubectl create secret generic keydb-password --from-literal=password=KEYDB_PASSWORD

keydb/templates/sts.yaml

@@ -49,7 +49,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ .Values.existingSecret }}
-              key: {{ default "password" .Values.existingSecretPasswordKey }}
+              key: {{ .Values.existingSecretPasswordKey }}
         {{- else if .Values.password }}
         - name: REDIS_PASSWORD
           value: "{{ .Values.password }}"

keydb/values.yaml

@@ -8,7 +8,7 @@ nodes: 3
 
 password: ""
 existingSecret: ""
-existingSecretPasswordKey: ""
+existingSecretPasswordKey: "password"
 port: 6379
 
 threads: 2