Merge branch 'master' of github.com:amazeeio/lagoon

uselagoon · Jan 24, 2021 · e2e06a5 · e2e06a5
2 parents a2642d0 + b63e4af
commit e2e06a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/images/oc-build-deploy-dind/build-deploy-docker-compose.sh b/images/oc-build-deploy-dind/build-deploy-docker-compose.sh
@@ -846,9 +846,6 @@ if oc --insecure-skip-tls-verify -n ${OPENSHIFT_PROJECT} get schedules.backup.ap
   PRODUCTION_WEEKLY_BACKUP_RETENTION=$(cat .lagoon.yml | shyaml get-value backup-retention.production.weekly "")
   PRODUCTION_DAILY_BACKUP_RETENTION=$(cat .lagoon.yml | shyaml get-value backup-retention.production.daily "")
 
-  # Pull in environment type (development/production)
-  TEMPLATE_PARAMETERS+=(-p ENVIRONMENT_TYPE="${ENVIRONMENT_TYPE}")
-
   # Set template parameters for retention values (prefer .lagoon.yml values over supplied defaults after ensuring they are valid integers via "-eq" comparison)
   if [ ! -z $PRODUCTION_MONTHLY_BACKUP_RETENTION ] && [ "$PRODUCTION_MONTHLY_BACKUP_RETENTION" -eq "$PRODUCTION_MONTHLY_BACKUP_RETENTION" ] && [ $ENVIRONMENT_TYPE = 'production']; then
     TEMPLATE_PARAMETERS+=(-p MONTHLY_BACKUP_RETENTION="${PRODUCTION_MONTHLY_BACKUP_RETENTION}")

diff --git a/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml b/images/oc-build-deploy-dind/openshift-templates/backup-schedule.yml
@@ -45,13 +45,13 @@ parameters:
     required: true
   - name: MONTHLY_BACKUP_RETENTION
     description: How many monthly backups should be retained after pruning
-    required: true
+    value: '1'
   - name: WEEKLY_BACKUP_RETENTION
     description: How many weekly backups should be retained after pruning
-    required: true
+    value: '4'
   - name: DAILY_BACKUP_RETENTION
     description: How many daily backups should be retained after pruning
-    required: true
+    value: '7'
   - name: ENVIRONMENT_TYPE
     description: What type of environment this is (production/development)
     required: true