Merge pull request #6594 from Lyndon-Li/issue-fix-6571

Fix issue 6571
vmware-tanzu · Aug 3, 2023 · 06628cf · 06628cf
2 parents bb74c35 + 69bc84c
commit 06628cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelogs/unreleased/6594-Lyndon-Li b/changelogs/unreleased/6594-Lyndon-Li
@@ -0,0 +1 @@
+Fix issue #6571, fix the problem for restore item operation to set the errors correctly so that they can be recorded by Velero restore and then reflect the correct status for Velero restore.
diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go
@@ -535,8 +535,8 @@ func (r *restoreReconciler) runValidatedRestore(restore *api.Restore, info backu
 	// Completed yet.
 	inProgressOperations, _, opsCompleted, opsFailed, errs := getRestoreItemOperationProgress(restoreReq.Restore, pluginManager, *restoreReq.GetItemOperationsList())
 	if len(errs) > 0 {
-		for err := range errs {
-			restoreLog.Error(err)
+		for _, err := range errs {
+			restoreErrors.Velero = append(restoreErrors.Velero, fmt.Sprintf("error from restore item operation: %v", err))
 		}
 	}