Francisco Borges Aurindo Barros
--- a/controllers/drupalsite_deletion_controller.go 0 → 100644
+++ b/controllers/drupalsite_deletion_controller.go 0 → 100644
+	if drupalSite.GetDeletionTimestamp() != nil {
+		if controllerutil.ContainsFinalizer(drupalSite, finalizerStr) {
+			backup, err := r.getFinalDrupalBackup(ctx, drupalSite, log)
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			if backup.Name == "" {
+				log.Info("No backup in place, making a backup before deletion")
+				r.makeFinalDrupalBackup(ctx, drupalSite, log)
+				return ctrl.Result{RequeueAfter: time.Minute * time.Duration(minutesWaitingForBackup)}, nil
+			}
+			if backup.Status.Phase == velerov1.BackupPhaseCompleted {
+				return r.cleanupDrupalSite(ctx, log, drupalSite, &backup)
+			}
+			if backup.Status.Phase == velerov1.BackupPhaseFailed {
+				log.Error(nil, "Final Backup before deletion has failed")
--- a/controllers/drupalsite_controller_test.go
+++ b/controllers/drupalsite_controller_test.go
 			})
 		})
 	})
+	/*
+		Describe("Deleting the drupalsite object", func() {
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
    file: 'docker-images-ci-templates/DockerImages.gitlab-ci.yml'

 stages:
-  - test
  - build
+  - test
--- a/controllers/drupalsite_controller_test.go
+++ b/controllers/drupalsite_controller_test.go
 			})
 		})
 	})
-
+	/*
--- a/controllers/drupalsite_deletion_controller.go 0 → 100644
+++ b/controllers/drupalsite_deletion_controller.go 0 → 100644
+	finalBackupLabelState     = "drupalSite-FinalBackupState"
+	finalBackupStateOngoing   = "deletionOngoing"
+	finalBackupStateProcessed = "applicationDeleted"
+	minutesWaitingForBackup   = 2
+)
+
+// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites/finalizers,verbs=update
+// +kubebuilder:rbac:groups=app,resources=deployments,verbs=*
+
+// SetupWithManager adds a manager which watches the resources
+func (r *DrupalSiteDeletionReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&webservicesv1a1.DrupalSite{}).
+		Watches(&source.Kind{Type: &appsv1.Deployment{}}, handler.EnqueueRequestsFromMapFunc(
--- a/controllers/drupalsite_deletion_controller.go 0 → 100644
+++ b/controllers/drupalsite_deletion_controller.go 0 → 100644
+	backup.Labels[finalBackupLabelState] = finalBackupStateProcessed
+	if err := r.Update(ctx, backup, &client.UpdateOptions{}); err != nil {
+		return ctrl.Result{}, err
+	}
+	controllerutil.RemoveFinalizer(drp, finalizerStr)
+	if err := r.ensureNoBackupSchedule(ctx, drp, log); err != nil {
+		return ctrl.Result{}, err
+	}
+	return r.updateCRorFailReconcile(ctx, log, drp)
+}
+
+func (r *DrupalSiteDeletionReconciler) getFinalDrupalBackup(ctx context.Context, d *webservicesv1a1.DrupalSite, log logr.Logger) (velerov1.Backup, reconcileError) {
+	finalBackupList := &velerov1.BackupList{}
+
+	labelSelector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
+		MatchLabels: map[string]string{"drupalSite": d.Name, finalBackupLabelState: finalBackupStateOngoing},