Merge branch 'schedule-backup-loc' into 'master'

Add backup storage location to velero schedule

See merge request !189

chart/drupalsite-operator/templates/manager-deploy.yaml

@@ -33,6 +33,7 @@ spec:
         - --cluster-name={{.Values.drupalsiteOperator.clusterName}}
         - --easystart-backup-name={{.Values.drupalsiteOperator.easystartBackupName}}
         - --supported-drupal-version-name={{.Values.drupalsiteOperator.supportedDrupalVersionName}}
+        - --velero-backup-storage-location={{.Values.drupalsiteOperator.veleroBackupStorageLocation}}
         command:
         - /manager
         image: {{ .Values.image | quote }}

chart/drupalsite-operator/values.yaml

@@ -30,3 +30,4 @@ drupalsiteOperator:
   enableTopologySpread: false
   clusterName: {}
   easystartBackupName: ""
+  veleroBackupStorageLocation: "default"

controllers/drupalsite_controller.go

@@ -72,6 +72,8 @@ var (
 	EasystartBackupName string
 	// SupportedDrupalVersion Name
 	SupportedDrupalVersionName string
+	// VeleroBackupStorageLocation refers to the name of the Velero backupStorageLocation to be used
+	VeleroBackupStorageLocation string
 )
 
 // DrupalSiteReconciler reconciles a DrupalSite object

controllers/drupalsite_resources.go

@@ -1655,6 +1655,7 @@ func scheduledBackupsForDrupalSite(currentobject *velerov1.Schedule, d *webservi
 		TTL: metav1.Duration{
 			Duration: 14 * 24 * time.Hour,
 		},
+		StorageLocation: VeleroBackupStorageLocation,
 	}
 	// Set UseOwnerReferencesInBackup to False since we do not want the Backups to be deleted when Schedule object is deleted or modified
 	currentobject.Spec.UseOwnerReferencesInBackup = pointer.BoolPtr(false)

controllers/suite_test.go

@@ -84,6 +84,7 @@ var _ = BeforeSuite(func(done Done) {
 	ClusterName = "test"
 	EasystartBackupName = "easystart-backup"
 	SupportedDrupalVersionName = "supported-drupal-versions"
+	VeleroBackupStorageLocation = "default"
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

main.go

@@ -87,6 +87,7 @@ func main() {
 	flag.StringVar(&controllers.EasystartBackupName, "easystart-backup-name", "", "The name of the easy-start backup")
 	// The variable name is set here: https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution/-/blob/master/supporteddrupalversions/chart/templates/supported-drupal-versions.yaml
 	flag.StringVar(&controllers.SupportedDrupalVersionName, "supported-drupal-version-name", "supported-drupal-versions", "The name of the resource used cluster-wide for supported drupal versions")
+	flag.StringVar(&controllers.VeleroBackupStorageLocation, "velero-backup-storage-location", "default", "The name of the backupStorageLocation to be used for Velero Schedules created by the controller")
 	opts := zap.Options{
 		Development: false,
 	}