Update restore controller logic for restore deletion

1. Skip deleting the restore files from storage if the backup/BSL is not found 2. Allow deleting the restore files from storage even though the BSL is readonly Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
vmware-tanzu · Sep 5, 2023 · e4c9594 · e4c9594
1 parent 6790a18
commit e4c9594
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/changelogs/unreleased/6761-ywk253100 b/changelogs/unreleased/6761-ywk253100
@@ -0,0 +1 @@
+Update restore controller logic for restore deletion
diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go
@@ -671,14 +671,13 @@ func (r *restoreReconciler) deleteExternalResources(restore *api.Restore) error
 
 	backupInfo, err := r.fetchBackupInfo(restore.Spec.BackupName)
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			r.logger.Errorf("got not found error: %v, skip deleting the restore files in object storage", err)
+			return nil
+		}
 		return errors.Wrap(err, fmt.Sprintf("can't get backup info, backup: %s", restore.Spec.BackupName))
 	}
 
-	// if storage locations is read-only, skip deletion
-	if backupInfo.location.Spec.AccessMode == api.BackupStorageLocationAccessModeReadOnly {
-		return nil
-	}
-
 	// delete restore files in object storage
 	pluginManager := r.newPluginManager(r.logger)
 	defer pluginManager.CleanupClients()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update restore controller logic for restore deletion