mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-05 04:55:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6770 from ywk253100/230906_restore

Browse Source 
[cherry-pick]Update restore controller logic for restore deletion
This commit is contained in:
Daniel Jiang
2023-09-06 12:06:04 +08:00
committed by GitHub
parent 49bb998e59 da6ac026d1
commit a6d61ec5f6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/6770-ywk253100 Normal file
View File

@@ -0,0 +1 @@
Update restore controller logic for restore deletion

9
pkg/controller/restore_controller.go
View File

@@ -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()