From 0001792d0d9ca09e915676b2590e3c07305e15cd Mon Sep 17 00:00:00 2001
From: Sophie Huang <sh879n@att.com>
Date: Wed, 26 Jan 2022 15:52:58 +0000
Subject: [PATCH] Enhance database backup for etcdctl and postgresql

Updated environment variables for remote DB backups

Change-Id: I8a039d5e31399442662457a951facc6546a87577
---
 .../bin/utility/_etcd_ondemand_job.sh.tpl         | 15 +++++++++++++++
 .../templates/bin/utility/_pg_ondemand_job.sh.tpl | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl b/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl
index 3d03b407..f4b45112 100644
--- a/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl
+++ b/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl
@@ -102,6 +102,21 @@ spec:
                   name: ${ETCD_CONF_SECRET}
             - name: OS_IDENTITY_API_VERSION
               value: "3"
+            - name: NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_RETRIES
+                  name: ${ETCD_CONF_SECRET}
+            - name: MIN_DELAY_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_SEND_DELAY_MIN
+                  name: ${ETCD_CONF_SECRET}
+            - name: MAX_DELAY_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_SEND_DELAY_MAX
+                  name: ${ETCD_CONF_SECRET}
 EOF
 
 if $ETCD_REMOTE_BACKUP_ENABLED; then
diff --git a/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl b/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl
index b9ffac43..f5a4eba0 100644
--- a/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl
+++ b/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl
@@ -115,6 +115,21 @@ spec:
                   name: ${POSTGRESQL_CONF_SECRET}
             - name: OS_IDENTITY_API_VERSION
               value: "3"
+            - name: NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_RETRIES
+                  name: ${POSTGRESQL_CONF_SECRET}
+            - name: MIN_DELAY_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_SEND_DELAY_MIN
+                  name: ${POSTGRESQL_CONF_SECRET}
+            - name: MAX_DELAY_SEND_BACKUP_TO_REMOTE
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_SEND_DELAY_MAX
+                  name: ${POSTGRESQL_CONF_SECRET}
 EOF
 
 if $POSTGRESQL_REMOTE_BACKUP_ENABLED; then