From aa680b26057200facede99810cca2c06af4775df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 29 Jan 2019 16:47:51 +0100 Subject: [PATCH] [stable/mysqldump] added axdotl to OWNERS / made persistentVolumeReclaimPolicy configurable (#10933) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added axdotl to maintainers and OWNERS file Signed-off-by: André Bauer * made persistentVolumeReclaimPolicy configurable Signed-off-by: André Bauer * fixed mysqldump warning and gsutil rsync argument Signed-off-by: André Bauer --- stable/mysqldump/Chart.yaml | 6 ++++-- stable/mysqldump/OWNERS | 2 ++ stable/mysqldump/README.md | 1 + stable/mysqldump/templates/configmap.yaml | 6 +++--- stable/mysqldump/templates/pvc.yaml | 1 + stable/mysqldump/values.yaml | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stable/mysqldump/Chart.yaml b/stable/mysqldump/Chart.yaml index db2beae511..af00f82949 100644 --- a/stable/mysqldump/Chart.yaml +++ b/stable/mysqldump/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 2.2.0 +appVersion: 2.3.0 description: A Helm chart to help backup MySQL databases using mysqldump name: mysqldump -version: 2.2.0 +version: 2.3.0 keywords: - mysql - mysqldump @@ -17,3 +17,5 @@ maintainers: email: username.taken@gmail.com - name: monotek email: monotek23@gmail.com +- name: axdotl + email: axel.koehler@kiwigrid.com diff --git a/stable/mysqldump/OWNERS b/stable/mysqldump/OWNERS index 955472a3da..b43e7803b5 100644 --- a/stable/mysqldump/OWNERS +++ b/stable/mysqldump/OWNERS @@ -1,6 +1,8 @@ approvers: - paulczar - monotek +- axdotl reviewers: - paulczar - monotek +- axdotl diff --git a/stable/mysqldump/README.md b/stable/mysqldump/README.md index 8251e1fd3d..93e34f7115 100644 --- a/stable/mysqldump/README.md +++ b/stable/mysqldump/README.md @@ -64,6 +64,7 @@ The following tables lists the configurable parameters of the mysqldump chart an | persistence.size | size of PVC to create | 8Gi | | persistence.accessMode | accessMode to use for PVC | ReadWriteOnce | | persistence.storageClass | storage class to use for PVC | | +| persistence.reclaimPolicy | used PV reclaim policy | "delete" | | persistence.subPath | subPath for PVC | | | allDatabases.enabled | backup all databases | true | | allDatabases.SingleSqlFile | backup all databases to singel file | false | diff --git a/stable/mysqldump/templates/configmap.yaml b/stable/mysqldump/templates/configmap.yaml index c5b7a367d7..0e73da5f3b 100644 --- a/stable/mysqldump/templates/configmap.yaml +++ b/stable/mysqldump/templates/configmap.yaml @@ -54,13 +54,13 @@ data: MYSQL_DB="{{ .Values.mysql.db }}" echo "Backing up single db ${MYSQL_DB}" {{ if .Values.saveToDirectory }}mkdir -p "${BACKUP_DIR}"/"${MYSQL_DB}"{{ end }} - mysqldump ${MYSQL_OPTS} -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u ${MYSQL_USERNAME}{{ if .Values.mysql.password }} -p${MYSQL_PASSWORD}{{ end }} --database ${MYSQL_DB} | gzip > ${BACKUP_DIR}/{{ if .Values.saveToDirectory }}${MYSQL_DB}/{{ end }}${TIMESTAMP}_${MYSQL_DB}.sql.gz + mysqldump ${MYSQL_OPTS} -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u ${MYSQL_USERNAME}{{ if .Values.mysql.password }} -p${MYSQL_PASSWORD}{{ end }} --databases ${MYSQL_DB} | gzip > ${BACKUP_DIR}/{{ if .Values.saveToDirectory }}${MYSQL_DB}/{{ end }}${TIMESTAMP}_${MYSQL_DB}.sql.gz {{ else if and (.Values.allDatabases.enabled) (eq .Values.allDatabases.singleBackupFile false)}} for MYSQL_DB in $(mysql -h "${MYSQL_HOST}" -u ${MYSQL_USERNAME}{{ if .Values.mysql.password }} -p${MYSQL_PASSWORD}{{ end }} -B -N -e "SHOW DATABASES;"|egrep -v '^(information|performance)_schema$'); do echo "Backing up db ${MYSQL_DB}" {{ if .Values.saveToDirectory }}mkdir -p "${BACKUP_DIR}"/"${MYSQL_DB}"{{ end }} - mysqldump ${MYSQL_OPTS} -h ${MYSQL_HOST} -u ${MYSQL_USERNAME}{{ if .Values.mysql.password }} -p${MYSQL_PASSWORD}{{ end }} --database ${MYSQL_DB} | gzip > ${BACKUP_DIR}/{{ if .Values.saveToDirectory }}${MYSQL_DB}/{{ end }}${TIMESTAMP}_${MYSQL_DB}.sql.gz + mysqldump ${MYSQL_OPTS} -h ${MYSQL_HOST} -u ${MYSQL_USERNAME}{{ if .Values.mysql.password }} -p${MYSQL_PASSWORD}{{ end }} --databases ${MYSQL_DB} | gzip > ${BACKUP_DIR}/{{ if .Values.saveToDirectory }}${MYSQL_DB}/{{ end }}${TIMESTAMP}_${MYSQL_DB}.sql.gz rc=$? done @@ -82,7 +82,7 @@ data: {{ if .Values.upload.googlestoragebucket.enabled }} echo "upload files to google storage bucket {{ .Values.upload.googlestoragebucket.bucketname }}" gcloud auth activate-service-account --key-file /root/gcloud/{{ .Values.upload.googlestoragebucket.secretFileName }} - gsutil -r -m rsync -x '.*\.state' -d ${BACKUP_DIR}/ {{ .Values.upload.googlestoragebucket.bucketname }} + gsutil -m rsync -r -x '.*\.state' -d ${BACKUP_DIR}/ {{ .Values.upload.googlestoragebucket.bucketname }} rcu=$? {{ end }} diff --git a/stable/mysqldump/templates/pvc.yaml b/stable/mysqldump/templates/pvc.yaml index e5ea4facfd..f3655fa291 100644 --- a/stable/mysqldump/templates/pvc.yaml +++ b/stable/mysqldump/templates/pvc.yaml @@ -21,5 +21,6 @@ spec: resources: requests: storage: {{ .Values.persistence.size }} + persistentVolumeReclaimPolicy: {{ .Values.persistence.reclaimPolicy }} {{- end -}} {{- end -}} diff --git a/stable/mysqldump/values.yaml b/stable/mysqldump/values.yaml index 5178d55ecf..e5b1e15779 100644 --- a/stable/mysqldump/values.yaml +++ b/stable/mysqldump/values.yaml @@ -49,6 +49,7 @@ persistence: enabled: true size: 8Gi accessMode: ReadWriteOnce + reclaimPolicy: delete subPath: ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning