From 1ba9194dc5356e145ab2ae984e950e99e8475481 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Tue, 18 Jul 2023 20:53:00 +0000 Subject: [PATCH] [oadp-1.2] OADP-2049: Ensure all replicationSources are removed after a successful backup (#257) Co-authored-by: Shubham Pampattiwar --- controllers/cleanup.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/controllers/cleanup.go b/controllers/cleanup.go index 6f7ecde..de882c4 100644 --- a/controllers/cleanup.go +++ b/controllers/cleanup.go @@ -21,6 +21,7 @@ var cleanupVSRTypes = []client.Object{ func (r *VolumeSnapshotBackupReconciler) CleanBackupResources(log logr.Logger) (bool, error) { cleanupVSBTypes := []client.Object{ + &volsyncv1alpha1.ReplicationSource{}, &corev1.PersistentVolumeClaim{}, &corev1.Pod{}, &snapv1.VolumeSnapshot{}, @@ -63,23 +64,6 @@ func (r *VolumeSnapshotBackupReconciler) CleanBackupResources(log logr.Logger) ( return false, err } - // Check if retain policy is set by the user for datamover backups - retainPolicyPresent, err := r.isRetainPolicySet(&vsb) - if err != nil { - return false, err - } - - // Check if schedule cron trigger is set by the user for datamover backups - scheduleCronTriggerPresent, err := r.scheduleCronTriggerSet(&vsb) - if err != nil { - return false, err - } - - // If retainPolicy or schedule cron trigger is not set then cleanup the ReplicationSource objects as well - if !retainPolicyPresent && !scheduleCronTriggerPresent { - cleanupVSBTypes = append(cleanupVSBTypes, &volsyncv1alpha1.ReplicationSource{}) - } - for _, obj := range cleanupVSBTypes { err := r.DeleteAllOf(r.Context, obj, deleteOptions...) if err != nil {