Merge pull request #351 from appuio/feat/mariadb/config-kubectl-image

[mariadb-galera] Add option to configure pre-upgrade kubectl image
appuio · Sep 8, 2021 · 8ee1ff8 · 8ee1ff8
2 parents ee1bcbd + 5ee93de
commit 8ee1ff8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/appuio/mariadb-galera/Chart.yaml b/appuio/mariadb-galera/Chart.yaml
@@ -27,4 +27,4 @@ sources:
   - https://github.com/bitnami/bitnami-docker-mariadb-galera
   - https://github.com/prometheus/mysqld_exporter
   - https://mariadb.org
-version: 1.1.0
+version: 1.2.0
diff --git a/appuio/mariadb-galera/README.md b/appuio/mariadb-galera/README.md
@@ -1,6 +1,6 @@
 # mariadb-galera
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: 10.5.12](https://img.shields.io/badge/AppVersion-10.5.12-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 10.5.12](https://img.shields.io/badge/AppVersion-10.5.12-informational?style=flat-square)
 
 MariaDB Galera is a multi-master database cluster solution for synchronous replication and high availability.
 
@@ -43,7 +43,8 @@ Edit the README.gotmpl.md template instead.
 | extraInitContainers | list | `[]` | Additional init containers (this value is evaluated as a template) |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| forceUpdate | bool | `false` | Force update the StatefulSet. |
+| 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. |
+| forceUpdateKubectlImage | string | `"quay.io/bitnami/kubectl"` | Image used to recreate the StatefulSet. Needs to have `kubectl` in its `$PATH` |
 | fullnameOverride | string | `""` | String to fully override common.names.fullname template with a string |
 | galera.bootstrap.bootstrapFromNode | string | `""` | Node to bootstrap from, you will need to change this parameter in case you want to bootstrap from other node |
 | galera.bootstrap.forceSafeToBootstrap | bool | `false` | Force `safe_to_bootstrap: 1` in `grastate.date` file. This will set safe_to_bootstrap=1 in the node indicated by bootstrapFromNode. |

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

diff --git a/appuio/mariadb-galera/values.yaml b/appuio/mariadb-galera/values.yaml
@@ -461,8 +461,10 @@ nodeSelector: {}
 ##
 tolerations: []
 # -- 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.
+# 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 have `kubectl` in its `$PATH`
+forceUpdateKubectlImage: "quay.io/bitnami/kubectl"
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
 persistence: