From 72c2c43a4c1b89bc1dfba0a37966b35d78374d78 Mon Sep 17 00:00:00 2001 From: Travis Neely Date: Wed, 23 Sep 2020 01:02:41 -0500 Subject: [PATCH] Added STORAGE_POLICY env for both postgresql and etcd on-demand pods REMOTE_BACKUP_STORAGE_POLICY is not being set in the on-demand pods, so if the storage containers are created by the on-demand pods, they will not be stored in the correct ceph pool. The related backup cronjobs for each database type are already setup with this value, this fix brings the on demand backup jobs in line with the cronjobs. Change-Id: I6fc83bdfb880bdf5841e12a72ce177ae2f364cdd --- .../templates/bin/utility/_etcd_ondemand_job.sh.tpl | 5 +++++ .../templates/bin/utility/_pg_ondemand_job.sh.tpl | 5 +++++ 2 files changed, 10 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 15d26de3..94a2abc1 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 @@ -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: 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 0bbc3d25..260e802d 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 @@ -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