Merge pull request #350 from appuio/feat/redis/config-kubectl-image

[redis] Make image used for pre-upgrade hook configurable
appuio · Sep 8, 2021 · a21879a · a21879a
2 parents 8ee1ff8 + 991aca0
commit a21879a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/appuio/redis/Chart.yaml b/appuio/redis/Chart.yaml
@@ -24,4 +24,4 @@ name: redis
 sources:
 - https://github.com/bitnami/bitnami-docker-redis
 - http://redis.io/
-version: 1.2.1
+version: 1.3.0
diff --git a/appuio/redis/README.md b/appuio/redis/README.md
@@ -1,6 +1,6 @@
 # redis
 
-![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![AppVersion: 6.2.1](https://img.shields.io/badge/AppVersion-6.2.1-informational?style=flat-square)
+![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: 6.2.1](https://img.shields.io/badge/AppVersion-6.2.1-informational?style=flat-square)
 
 Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 
@@ -122,7 +122,8 @@ Edit the README.gotmpl.md template instead.
 | sentinel.extraEnvVarsCM | list | `[]` | ConfigMap with extra env vars: |
 | sentinel.extraEnvVarsSecret | list | `[]` | Secret with extra env vars: |
 | sentinel.failoverTimeout | int | `18000` |  |
-| sentinel.forceUpdate | bool | `false` |  |
+| sentinel.forceUpdate | bool | `false` | Force update the StatefulSet. If enabled the chart will recreate the StatefulSet without touching the Pods (cascade orphan), allowing you to update locked field, such as PVC size. |
+| sentinel.forceUpdateKubectlImage | string | `"quay.io/bitnami/kubectl"` | Image used to recreate the StatefulSet. Needs to contain `kubectl` in its `$PATH`. |
 | sentinel.image.pullPolicy | string | `"IfNotPresent"` | Sentinel image pull policy Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' |
 | sentinel.image.registry | string | `"docker.io"` | Sentinel image registry |
 | sentinel.image.repository | string | `"bitnami/redis-sentinel"` | Sentinel image repository |

diff --git a/appuio/redis/templates/recreate.yaml b/appuio/redis/templates/recreate.yaml
@@ -75,7 +75,7 @@ spec:
       serviceAccountName: {{ printf "%s-sts-deleter" (include "common.names.fullname" .) }}
       containers:
         - name: pre-upgrade-delete-sts
-          image: "docker.io/bitnami/kubectl"
+          image: {{ .Values.sentinel.forceUpdateKubectlImage }}
           command:
             - "kubectl"
             - "-n"

diff --git a/appuio/redis/values.yaml b/appuio/redis/values.yaml
@@ -84,9 +84,11 @@ sentinel:
   port: 26379
 
 
-  ## -- Force update the StatefulSet.
-  ## If enabled the chart will recreate the StatefulSet without touching the Pods (cascade orphan), allowing you to update locked field, such as PVC size.
+  # -- Force update the StatefulSet.
+  # If enabled the chart will recreate the StatefulSet without touching the Pods (cascade orphan), allowing you to update locked field, such as PVC size.
   forceUpdate: false
+  # -- Image used to recreate the StatefulSet. Needs to contain `kubectl` in its `$PATH`.
+  forceUpdateKubectlImage: "quay.io/bitnami/kubectl"
 
   # -- Delay seconds when cleaning nodes IPs.
   # When starting it will clean the sentinels IP (RESET "*") in all the nodes.