diff --git a/mariadb/templates/bin/_backup_mariadb.sh.tpl b/mariadb/templates/bin/_backup_mariadb.sh.tpl index ef3a6a74b0..cd719d6179 100644 --- a/mariadb/templates/bin/_backup_mariadb.sh.tpl +++ b/mariadb/templates/bin/_backup_mariadb.sh.tpl @@ -19,24 +19,10 @@ ARCHIVE_DIR=${MARIADB_BACKUP_BASE_DIR}/db/${MARIADB_POD_NAMESPACE}/mariadb/archi MYSQL="mysql \ --defaults-file=/etc/mysql/admin_user.cnf \ - --host=$MARIADB_SERVER_SERVICE_HOST \ --connect-timeout 10" MYSQLDUMP="mysqldump \ - --defaults-file=/etc/mysql/admin_user.cnf \ - --host=$MARIADB_SERVER_SERVICE_HOST" - -delete_files() { - files_to_delete=("$@") - for f in "${files_to_delete[@]}" - do - if [ -f $f ] - then - echo "Deleting file $f." - rm -rf $f - fi - done -} + --defaults-file=/etc/mysql/admin_user.cnf" days_difference() { archive_date=$( date --date="$1" +%s ) diff --git a/mariadb/templates/cron-job-backup-mariadb.yaml b/mariadb/templates/cron-job-backup-mariadb.yaml index c6835c347a..2da5cd357c 100644 --- a/mariadb/templates/cron-job-backup-mariadb.yaml +++ b/mariadb/templates/cron-job-backup-mariadb.yaml @@ -52,11 +52,11 @@ spec: - /tmp/backup_mariadb.sh env: - name: MARIADB_BACKUP_BASE_DIR - value: {{ .Values.conf.backup.base_path }} + value: {{ .Values.conf.backup.base_path | quote }} - name: MYSQL_BACKUP_MYSQLDUMP_OPTIONS - value: {{ .Values.conf.backup.mysqldump_options }} + value: {{ .Values.conf.backup.mysqldump_options | quote }} - name: MARIADB_BACKUP_DAYS_TO_KEEP - value: "{{ .Values.conf.backup.days_of_backup_to_keep }}" + value: {{ .Values.conf.backup.days_of_backup_to_keep | quote }} - name: MARIADB_POD_NAMESPACE valueFrom: fieldRef: