Merge pull request #7055 from kaovilai/warnOnCreateAlreadyExistsGetEr…

…ror-release-1.11 release-1.11: restore: Use warning when Create IsAlreadyExist and Get error (#7004)
vmware-tanzu · Nov 3, 2023 · 8f9e937 · 8f9e937
2 parents c6ec8f2 + d7dd050
commit 8f9e937
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelogs/unreleased/7055-kaovilai b/changelogs/unreleased/7055-kaovilai
@@ -0,0 +1 @@
+restore: Use warning when Create IsAlreadyExist and Get error
diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go
@@ -1357,8 +1357,8 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
 		// otherwise, we will return the original creation error.
 		fromCluster, err = resourceClient.Get(name, metav1.GetOptions{})
 		if err != nil && isAlreadyExistsError {
-			ctx.log.Errorf("Error retrieving in-cluster version of %s: %v", kube.NamespaceAndName(obj), err)
-			errs.Add(namespace, err)
+			ctx.log.Warnf("Unable to retrieve in-cluster version of %s: %v, object won't be restored by velero or have restore labels, and existing resource policy is not applied", kube.NamespaceAndName(obj), err)
+			warnings.Add(namespace, err)
 			return warnings, errs, itemExists
 		}
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		restore: Use warning when Create IsAlreadyExist and Get error