Merge pull request #28 from karolorlamowski/multimaster-feature

Multimaster feature
Enapter · Jul 30, 2021 · 9c57e4b · 9c57e4b
2 parents 5eaaa61 + 1167774
commit 9c57e4b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git 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.21.0
+version: 0.22.0
 keywords:
 - keydb
 - redis

diff --git a/keydb/README.md b/keydb/README.md
@@ -30,7 +30,7 @@ helm install keydb enapter/keydb
 
 The following table lists the configurable parameters of the KeyDB chart and their default values.
 
-| Parameter                       | Description                                             | Default                                   |
+| Parameter                       | Description                                        | Default                                   |
 |:--------------------------------|:---------------------------------------------------|:------------------------------------------|
 | `image`                         | KeyDB docker image                                 | `eqalpha/keydb:x86_64_v6.0.16`            |
 | `imagePullPolicy`               | K8s imagePullPolicy                                | `IfNotPresent`                            |
@@ -39,7 +39,10 @@ The following table lists the configurable parameters of the KeyDB chart and the
 | `existingSecret`                | If enabled password is taken from secret           | `""`                                      |
 | `port`                          | KeyDB service port clients connect to              | `6379`                                    |
 | `threads`                       | KeyDB server-threads per node                      | `2`                                       |
-| `appendonly`                    | KeyDB appendonly setting                           | `"no"`                                    |
+| `multiMaster`                   | KeyDB multi-master setup                           | `yes`                                     |
+| `activeReplicas`                | KeyDB active replication setup                     | `yes`                                     |
+| `protectedMode`                 | KeyDB protection mode                              | `no`                                      |
+| `appendonly`                    | KeyDB appendonly setting                           | `no`                                      |
 | `configExtraArgs`               | Additional configuration arguments for KeyDB       | `{}`                                      |
 | `podAnnotations`                | KeyDB pods annotations                             | `{}`                                      |
 | `tolerations`                   | KeyDB tolerations setting                          | `{}`                                      |

diff --git a/keydb/templates/secret-utils.yaml b/keydb/templates/secret-utils.yaml
@@ -19,12 +19,12 @@ stringData:
       fi
     done
     exec keydb-server /etc/keydb/redis.conf \
-        --active-replica yes \
-        --multi-master yes \
+        --active-replica {{ .Values.activeReplicas }} \
+        --multi-master {{ .Values.multiMaster }} \
         --appendonly {{ .Values.appendonly }} \
         --bind 0.0.0.0 \
         --port "$port" \
-        --protected-mode no \
+        --protected-mode {{ .Values.protectedMode }} \
         --server-threads {{ .Values.threads | int }} \
 {{- if .Values.existingSecret }}
         --masterauth $REDIS_PASSWORD \

diff --git a/keydb/values.yaml b/keydb/values.yaml
@@ -13,6 +13,9 @@ port: 6379
 
 threads: 2
 
+multiMaster: "yes"
+activeReplicas: "yes"
+protectedMode: "no"
 appendonly: "no"
 
 configExtraArgs: {}