Skip to content

Commit

Permalink
[oadp-1.2] OADP-2049: Ensure all replicationSources are removed after…
Browse files Browse the repository at this point in the history
… a successful backup (#257)

Co-authored-by: Shubham Pampattiwar <spampatt@redhat.com>
  • Loading branch information
1 parent 53395f4 commit 1ba9194
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions controllers/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 1ba9194

Please sign in to comment.