[mysqldump] updated docker image & fixed exisitng secret (#50)

* updated docker image & fixed exisitng secret Signed-off-by: André Bauer <[email protected]> * fixed readme Signed-off-by: André Bauer <[email protected]>
kokuwaio · Dec 18, 2020 · 6dec8d7 · 6dec8d7
1 parent 496788f
commit 6dec8d7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/charts/mysqldump/Chart.yaml b/charts/mysqldump/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 4.0.0
+version: 4.0.1
 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
@@ -46,8 +46,9 @@ The following tables lists the configurable parameters of the mysqldump chart an
 
 | Parameter | Description | Default |
 | --------------------------------------------- | ------------------------------------------------------------------------------ | ---------------------------- |
+| 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 | "14"  |
+| image.tag | Version of image to use | "master-13" |
 | 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 |

diff --git a/charts/mysqldump/templates/secret-mysql.yaml b/charts/mysqldump/templates/secret-mysql.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.mysql.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -6,11 +7,12 @@ metadata:
  {{- include "mysqldump.labels" . | nindent 4 }}
 type: Opaque
 data:
-{{- if and (.Values.mysql.password) (not .Values.mysql.existingSecret) }}
+{{- if .Values.mysql.password }}
  MYSQL_PWD: {{ .Values.mysql.password | b64enc | quote }}
 {{- else }}
  MYSQL_PWD: {{ randAlphaNum 40 | b64enc | quote }}
 {{- end }}
 {{- if and (.Values.upload.openstack.enabled) (not .Values.upload.openstack.existingSecret) }}
  OS_PASSWORD: {{ .Values.upload.openstack.password | b64enc | quote }}
 {{- end }}
+{{- end }}
diff --git a/charts/mysqldump/values.yaml b/charts/mysqldump/values.yaml
@@ -5,7 +5,7 @@
 image:
  registry: quay.io
  repository: monotek/gcloud-mysql
- tag: "master-1"
+ tag: "master-13"
  ## 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#