Update add imagePullSecrets to keydb and exporter containers

Enapter · Jun 27, 2022 · b778ff7 · b778ff7
1 parent d0525d1
commit b778ff7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 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.39.0
+version: 0.40.0
 keywords:
 - keydb
 - redis

diff --git a/keydb/README.md b/keydb/README.md
@@ -13,6 +13,13 @@ helm install keydb enapter/keydb
 
 This chart bootstraps a [KeyDB](https://keydb.dev) highly available multi-master statefulset in a [Kubernetes](http://kubernetes.io) cluster using the Helm package manager.
 
+## 0.40.0 Upgrade notice
+
+As the chart is not yet production ready (0.x) backward incompatible changes can be introduced in minor releases.
+
+`exporter.pullPolicy` is deprecated in favor of `exporter.imagePullPolicy`
+
+
 ## 0.38.0 Upgrade notice
 
 As the chart is not yet production ready (0.x) backward incompatible changes can be introduced in minor releases.
@@ -88,7 +95,8 @@ 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.3.1`             |
-| `imagePullPolicy`               | K8s imagePullPolicy                                | `IfNotPresent`                            |
+| `imagePullPolicy`               | KeyDB imagePullPolicy                              | `IfNotPresent`                            |
+| `imagePullSecrets`              | KeyDB imagePullSecrets                             | `[]`                                      |
 | `nodes`                         | Number of KeyDB master pods                        | `3`                                       |
 | `password`                      | If enabled KeyDB servers are password-protected    | `""`                                      |
 | `existingSecret`                | If enabled password is taken from secret           | `""`                                      |
@@ -141,7 +149,8 @@ The following table lists the configurable parameters of the KeyDB chart and the
 | `serviceMonitor.scrapeTimeout`  | ServiceMonitor scrape timeout                      | `nil`                                     |
 | `exporter.enabled`              | Prometheus Exporter sidecar contaner               | `false`                                   |
 | `exporter.image`                | Exporter Image                                     | `oliver006/redis_exporter:v1.39.0-alpine` |
-| `exporter.pullPolicy`           | Exporter imagePullPolicy                           | `IfNotPresent`                            |
+| `exporter.imagePullPolicy`      | Exporter imagePullPolicy                           | `IfNotPresent`                            |
+| `exporter.imagePullSecrets`     | Exporter imagePullSecrets                          | `[]`                                      |
 | `exporter.port`                 | `prometheus.io/port`                               | `9121`                                    |
 | `exporter.portName`             | Exporter service port name in the Service spec     | `redis-exporter`                          |
 | `exporter.scrapePath`           | `prometheus.io/path`                               | `/metrics`                                |

diff --git a/keydb/templates/sts.yaml b/keydb/templates/sts.yaml
@@ -39,6 +39,8 @@ spec:
       - name: keydb
         image: {{ .Values.image }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        imagePullSecrets:
+          {{- toYaml .Values.imagePullSecrets | nindent 10 }}
         command:
         - /utils/server.sh
         env:
@@ -130,6 +132,8 @@ spec:
       - name: redis-exporter
         image: {{ .Values.exporter.image }}
         imagePullPolicy: {{ .Values.exporter.pullPolicy }}
+        imagePullSecrets:
+          {{- toYaml .Values.exporter.imagePullSecrets | nindent 10 }}
         args:
         {{- range $item := .Values.exporter.extraArgs }}
         {{- range $key, $value := $item }}
@@ -185,6 +189,8 @@ spec:
       - name: scripts
         image: {{ .Values.image }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        imagePullSecrets:
+          {{- toYaml .Values.imagePullSecrets | nindent 10 }}
         command:
         - /health/scripts_local.sh
         env:

diff --git a/keydb/values.yaml b/keydb/values.yaml
@@ -3,6 +3,7 @@ fullnameOverride: ""
 
 image: eqalpha/keydb:x86_64_v6.3.1
 imagePullPolicy: IfNotPresent
+imagePullSecrets: []
 
 nodes: 3
 
@@ -205,7 +206,8 @@ serviceMonitor:
 exporter:
   enabled: false
   image: oliver006/redis_exporter:v1.39.0-alpine
-  pullPolicy: IfNotPresent
+  imagePullPolicy: IfNotPresent
+  imagePullSecrets: []
 
   # Prometheus port & scrape path
   port: 9121