Merge "Added STORAGE_POLICY env for both postgresql and etcd on-demand pods"

2020-09-24 16:36:10 +00:00 · 2020-09-24 16:36:10 +00:00 · fca8c5f8b6
commit fca8c5f8b6
parent 9c18a3feff 72c2c43a4c
2 changed files with 10 additions and 0 deletions
--- a/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl
+++ b/charts/etcdctl-utility/templates/bin/utility/_etcd_ondemand_job.sh.tpl
@ -90,6 +90,11 @@ spec:
                secretKeyRef:
                  key: REMOTE_BACKUP_ENABLED
                  name: ${ETCD_CONF_SECRET}
+            - name: STORAGE_POLICY
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_STORAGE_POLICY
+                  name: ${ETCD_CONF_SECRET}
            - name: CONTAINER_NAME
              valueFrom:
                secretKeyRef:
--- a/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl
+++ b/charts/postgresql-utility/templates/bin/utility/_pg_ondemand_job.sh.tpl
@ -108,6 +108,11 @@ spec:
                secretKeyRef:
                  key: PG_DUMPALL_OPTIONS
                  name: ${POSTGRESQL_CONF_SECRET}
+            - name: STORAGE_POLICY
+              valueFrom:
+                secretKeyRef:
+                  key: REMOTE_BACKUP_STORAGE_POLICY
+                  name: ${POSTGRESQL_CONF_SECRET}
            - name: OS_IDENTITY_API_VERSION
              value: "3"
 EOF