[mysqldump] added compatibility with master-14 of monotek/gcloud-mysq… (

#99) * [mysqldump] added compatibility with master-14 of monotek/gcloud-mysql and update version Signed-off-by: Thomas TENIERE <[email protected]> * remove textlint Signed-off-by: André Bauer <[email protected]> Co-authored-by: André Bauer <[email protected]>
kokuwaio · Jan 18, 2022 · ee9e931 · ee9e931
1 parent 47d21f5
commit ee9e931
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -60,6 +60,7 @@ jobs:
           VALIDATE_JSCPD: false
           VALIDATE_KUBERNETES_KUBEVAL: false
           VALIDATE_YAML: false
+          VALIDATE_NATURAL_LANGUAGE: false
 
   kubeval-chart:
     runs-on: ubuntu-20.04

diff --git a/charts/mysqldump/Chart.yaml b/charts/mysqldump/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 4.2.0
+version: 5.0.0
 appVersion: 3.0.0
 description: A Helm chart to help backup MySQL databases using mysqldump
 name: mysqldump

diff --git a/charts/mysqldump/README.md b/charts/mysqldump/README.md
@@ -48,7 +48,7 @@ The following tables lists the configurable parameters of the mysqldump chart an
 | --------------------------------------------- | ------------------------------------------------------------------------------ | ---------------------------- |
 | image.registry                                | Name of docker registry to use                                                 | quay.io                      |
 | image.repository                              | Name of image to use                                                           | monotek/gcloud-mysql         |
-| image.tag                                     | Version of image to use                                                        | "master-13"                  |
+| image.tag                                     | Version of image to use                                                        | "master-15"                 |
 | image.pullPolicy                              | Pull Policy to use for image                                                   | IfNotPresent                 |
 | mysql.db                                      | single mysql db to backup (optional)                                           | mysql                        |
 | mysql.host                                    | mysql host to backup                                                           | mysql                        |
@@ -64,6 +64,7 @@ The following tables lists the configurable parameters of the mysqldump chart an
 | additionalSteps                               | run these extra shell steps after all backup jobs completed                    | []                           |
 | successfulJobsHistoryLimit                    | number of successful jobs to remember                                          | 5                            |
 | failedJobsHistoryLimit                        | number of failed jobs to remember                                              | 5                            |
+| sshMountpath                                  | User's path (used to mount ssh key if needed)                                  | "/home/cloudsdk"             |
 | persistentVolumeClaim                         | existing Persistent Volume Claim to backup to, leave blank to create a new one |                              |
 | persistence.enabled                           | create new PVC (unless `persistentVolumeClaim` is set)                         | true                         |
 | persistence.size                              | size of PVC to create                                                          | 8Gi                          |

diff --git a/charts/mysqldump/files/job.tpl b/charts/mysqldump/files/job.tpl
@@ -60,11 +60,11 @@ spec:
       mountPath: /scripts
 {{- if .Values.upload.ssh.enabled }}
     - name: ssh-privatekey
-      mountPath: /root/.ssh
+      mountPath: {{ .Values.sshMountpath }}/.ssh
 {{- end }}
 {{- if .Values.upload.googlestoragebucket.enabled }}
     - name: gcloud-keyfile
-      mountPath: /root/gcloud
+      mountPath: {{ .Values.sshMountpath }}/gcloud
 {{- end }}
     resources: 
 {{ toYaml .Values.resources | indent 6 }}

diff --git a/charts/mysqldump/values.yaml b/charts/mysqldump/values.yaml
@@ -5,12 +5,14 @@
 image:
   registry: quay.io
   repository: monotek/gcloud-mysql
-  tag: "master-13"
+  tag: "master-15"
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images#
   pullPolicy: IfNotPresent
 
+sshMountpath: "/home/cloudsdk"
+
 imagePullSecrets: []
 
 nameOverride: ""