diff --git a/charts/etcd/templates/bin/_etcdbackup.tpl b/charts/etcd/templates/bin/_etcdbackup.tpl index 9cf0d505..d3b16f20 100644 --- a/charts/etcd/templates/bin/_etcdbackup.tpl +++ b/charts/etcd/templates/bin/_etcdbackup.tpl @@ -30,6 +30,9 @@ export DB_NAMESPACE=${POD_NAMESPACE} export DB_NAME="etcd" export LOCAL_DAYS_TO_KEEP=$NUM_TO_KEEP export REMOTE_DAYS_TO_KEEP=$REMOTE_BACKUP_DAYS_TO_KEEP +export REMOTE_BACKUP_RETRIES=${NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE} +export MIN_DELAY_SEND_REMOTE=${MIN_DELAY_SEND_BACKUP_TO_REMOTE} +export MAX_DELAY_SEND_REMOTE=${MAX_DELAY_SEND_BACKUP_TO_REMOTE} export ARCHIVE_DIR=${BACKUP_DIR}/db/${DB_NAMESPACE}/${DB_NAME}/archive dump_databases_to_directory() { diff --git a/charts/etcd/templates/cron-job-etcd-backup.yaml b/charts/etcd/templates/cron-job-etcd-backup.yaml index c064599b..9961903d 100644 --- a/charts/etcd/templates/cron-job-etcd-backup.yaml +++ b/charts/etcd/templates/cron-job-etcd-backup.yaml @@ -119,6 +119,12 @@ spec: value: "{{ .Values.backup.remote_backup.container_name }}" - name: STORAGE_POLICY value: "{{ .Values.backup.remote_backup.storage_policy }}" + - name: NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE + value: {{ .Values.backup.remote_backup.number_of_retries | quote }} + - name: MIN_DELAY_SEND_BACKUP_TO_REMOTE + value: {{ .Values.backup.remote_backup.delay_range.min | quote }} + - name: MAX_DELAY_SEND_BACKUP_TO_REMOTE + value: {{ .Values.backup.remote_backup.delay_range.max | quote }} {{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.kubernetes }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 16 }} {{- end }} diff --git a/charts/etcd/templates/secret-backup-restore.yaml b/charts/etcd/templates/secret-backup-restore.yaml index 66fc327b..16830123 100644 --- a/charts/etcd/templates/secret-backup-restore.yaml +++ b/charts/etcd/templates/secret-backup-restore.yaml @@ -22,5 +22,8 @@ data: REMOTE_BACKUP_CONTAINER: {{ $envAll.Values.backup.remote_backup.container_name | b64enc }} REMOTE_BACKUP_DAYS_TO_KEEP: {{ $envAll.Values.backup.remote_backup.days_to_keep | quote | b64enc }} REMOTE_BACKUP_STORAGE_POLICY: {{ $envAll.Values.backup.remote_backup.storage_policy | b64enc }} + REMOTE_BACKUP_RETRIES: {{ $envAll.Values.backup.remote_backup.number_of_retries | quote | b64enc }} + REMOTE_BACKUP_SEND_DELAY_MIN: {{ $envAll.Values.backup.remote_backup.delay_range.min | quote | b64enc }} + REMOTE_BACKUP_SEND_DELAY_MAX: {{ $envAll.Values.backup.remote_backup.delay_range.max | quote | b64enc }} ... {{- end }} diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml index 5973f8d3..6b2c2f98 100644 --- a/charts/etcd/values.yaml +++ b/charts/etcd/values.yaml @@ -70,6 +70,10 @@ backup: container_name: etcd days_to_keep: 14 storage_policy: default-placement + number_of_retries: 5 + delay_range: + min: 30 + max: 60 endpoints: identity: