Merge "[fix] etcd backup to use different filename"

charts/etcd/templates/bin/_etcdbackup.tpl

@@ -18,10 +18,11 @@ set -ex
 BACKUP_DIR="/var/lib/etcd/backup"
 BACKUP_LOG={{ .Values.backup.backup_log_file | quote }}
 NUM_TO_KEEP={{ .Values.backup.no_backup_keep | quote }}
+BACKUP_FILE_NAME={{ .Values.service.name | quote }}
 SKIP_BACKUP=0
 
 etcdbackup() {
-  etcdctl snapshot save $BACKUP_DIR/etcd-backup-$(date +"%m-%d-%Y-%H-%M-%S").db >> $BACKUP_LOG
+  etcdctl snapshot save $BACKUP_DIR/$(BACKUP_FILE_NAME)-backup-$(date +"%m-%d-%Y-%H-%M-%S").db >> $BACKUP_LOG
   BACKUP_RETURN_CODE=$?
   if [[ $BACKUP_RETURN_CODE != 0 ]]; then
     echo "There was an error backing up the databases. Return code was $BACKUP_RETURN_CODE."

charts/etcd/templates/cron-job-etcd-backup.yaml

@@ -55,7 +55,7 @@ subjects:
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: {{ .Values.service.name }}-etcd-backup
+  name: {{ .Values.service.name }}-backup
 spec:
   schedule: {{ .Values.jobs.etcd_backup.cron | quote }}
   successfulJobsHistoryLimit: {{ .Values.jobs.etcd_backup.history.success }}

charts/etcd/values.yaml

@@ -40,7 +40,7 @@ etcd:
   cleanup_data: true
 
 backup:
-  host_backup_path: /var/lib/etcd/backup
+  host_backup_path: /var/backups/etcd
   backup_log_file: /var/log/etcd-backup.log
   no_backup_keep: 10
   etcdctl_dial_timeout: 15s