feat(release): Release of v1.0.0-beta4

drupalwxt · Dec 4, 2023 · 5e9aa13 · 5e9aa13
1 parent 2bf8171
commit 5e9aa13
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.0.0-beta3
+## 1.0.0-beta4
 
 - Breaking Changes
   - Drupal 7 Chart has been removed

diff --git a/charts/drupal/Chart.yaml b/charts/drupal/Chart.yaml
@@ -1,7 +1,7 @@
 name: drupal
 apiVersion: v2
 type: application
-version: 1.0.0-beta3
+version: 1.0.0-beta4
 appVersion: 5.0.1
 description: Drupal 9/10 variant of the Web Experience Toolkit (WxT).
 keywords:

diff --git a/charts/drupal/templates/cronjob/drupal-backup.yaml b/charts/drupal/templates/cronjob/drupal-backup.yaml
@@ -55,7 +55,7 @@ spec:
 
                 # Pre Install scripts
                 {{- if .Values.drupal.cron.preInstallScripts }}
-                {{ .Values.drupal.cron.preInstallScripts | nindent 16 }}
+                {{ toYaml .Values.drupal.cron.preInstallScripts | nindent 16 }}
                 {{- end }}
 
                 # Wait for DB to be available
@@ -65,6 +65,12 @@ spec:
                 # Check Drush status
                 drush status
 
+                # Cleanup old backups
+                {{- if .Values.drupal.backup.cleanup.enabled }}
+                find /backup/ -mindepth 1 -maxdepth 1 -type d -mtime +30 -exec echo "rm -rf " {} \; 2>&1;
+                find /backup/ -mindepth 1 -maxdepth 1 -type d -mtime +30 -exec rm -rf {} \; 2>&1;
+                {{- end }}
+
                 # Run cron
                 BACKUPNAME=$(date +%Y%m%d.%H%M%S)
                 mkdir -p /backup/$BACKUPNAME
@@ -88,6 +94,10 @@ spec:
               {{- if .Values.drupal.volumeMounts }}
               {{- include "common.tplvalues.render" (dict "value" .Values.drupal.volumeMounts "context" $) | nindent 14 }}
               {{- end }}
+              {{- if .Values.drupal.backup.enabled }}
+              - name: backup
+                mountPath: /backup
+              {{- end }}
           {{- include "drupal.connectionPooler" . | nindent 10 }}
           {{- if .Values.drupal.imagePullSecrets }}
           imagePullSecrets:

diff --git a/charts/drupal/templates/cronjob/drupal.yaml b/charts/drupal/templates/cronjob/drupal.yaml
@@ -55,7 +55,7 @@ spec:
 
                 # Pre Install scripts
                 {{- if .Values.drupal.cron.preInstallScripts }}
-                {{ .Values.drupal.cron.preInstallScripts | nindent 16 }}
+                {{ toYaml .Values.drupal.cron.preInstallScripts | nindent 16 }}
                 {{- end }}
 
                 # Wait for DB to be available

diff --git a/charts/drupal/values.yaml b/charts/drupal/values.yaml
@@ -213,6 +213,9 @@ drupal:
     # When enabled, a CronJob will run the job based on the schedule
     enabled: false
 
+    cleanup:
+      enabled: false
+
     # CronJob schedule (standard cron syntax)
     # Defaults to midnight
     schedule: '0 0 * * *'