From 57bacb86c0b41acde819282c6dcd3d6f455ce0e4 Mon Sep 17 00:00:00 2001 From: cdchris12 Date: Tue, 5 Jan 2021 16:02:14 -0600 Subject: [PATCH] Revert "Remove tag support for baas backups." This reverts commit 75145abaf843d8b077e2fc28727a98fae428ce69. --- .../helmcharts/k8up-schedule/templates/schedule.yaml | 4 ++++ .../openshift-templates/backup-schedule.yml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/images/kubectl-build-deploy-dind/helmcharts/k8up-schedule/templates/schedule.yaml b/images/kubectl-build-deploy-dind/helmcharts/k8up-schedule/templates/schedule.yaml index 977f1ddc96..a9f0aad832 100644 --- a/images/kubectl-build-deploy-dind/helmcharts/k8up-schedule/templates/schedule.yaml +++ b/images/kubectl-build-deploy-dind/helmcharts/k8up-schedule/templates/schedule.yaml @@ -19,9 +19,13 @@ spec: - '{{ .Values.lagoonEnvironmentType }}' check: schedule: '{{ .Values.check.schedule }}' + tags: + - '{{ .Values.lagoonEnvironmentType }}' prune: retention: keepDaily: '{{ .Values.prune.retention.keepDaily }}' keepWeekly: '{{ .Values.prune.retention.keepWeekly }}' keepMonthly: '{{ .Values.prune.retention.keepMonthly }}' + tags: + - '{{ .Values.lagoonEnvironmentType }}' schedule: '{{ .Values.prune.schedule }}' diff --git a/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml b/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml index 52a72adc6e..388f790eb4 100644 --- a/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml +++ b/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml @@ -73,11 +73,17 @@ objects: bucket: '${BAAS_BUCKET_NAME}' backup: schedule: '${BACKUP_SCHEDULE}' + tags: + - '${LAGOON_ENVIRONMENT_TYPE}' check: schedule: '${CHECK_SCHEDULE}' + tags: + - '${LAGOON_ENVIRONMENT_TYPE}' prune: retention: keepDaily: ${DAILY_BACKUP_RETENTION} keepWeekly: ${WEEKLY_BACKUP_RETENTION} keepMonthly: ${MONTHLY_BACKUP_RETENTION} + tags: + - '${LAGOON_ENVIRONMENT_TYPE}' schedule: '${PRUNE_SCHEDULE}'