From eefdbe05814adba53ee194fb28c2de47f0c517d5 Mon Sep 17 00:00:00 2001
From: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Date: Fri, 29 Mar 2019 12:21:02 -0500
Subject: [PATCH] [fix] etcd backup to use different filename

- Changed backup path to /var/backups/etcd
- Chanded backup filename to service name to support multiple releases
- Removed additional etcd from cronjob name

Change-Id: I1fabdfe1dccd8e170090eec0a69b2598e1e3e422
Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
---
 charts/etcd/templates/bin/_etcdbackup.tpl       | 3 ++-
 charts/etcd/templates/cron-job-etcd-backup.yaml | 2 +-
 charts/etcd/values.yaml                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/charts/etcd/templates/bin/_etcdbackup.tpl b/charts/etcd/templates/bin/_etcdbackup.tpl
index d728ba9a..40f5813d 100644
--- a/charts/etcd/templates/bin/_etcdbackup.tpl
+++ b/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."
diff --git a/charts/etcd/templates/cron-job-etcd-backup.yaml b/charts/etcd/templates/cron-job-etcd-backup.yaml
index b8828d64..7d06e527 100644
--- a/charts/etcd/templates/cron-job-etcd-backup.yaml
+++ b/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 }}
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
index 95e0bca2..e55bdf1b 100644
--- a/charts/etcd/values.yaml
+++ b/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