vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7055 from kaovilai/warnOnCreateAlreadyExistsGetError-release-1.11 

release-1.11: restore: Use warning when Create IsAlreadyExist and Get error (#7004)
release-1.11
Wenkai Yin(尹文开) 2023-11-03 09:25:13 +08:00 committed by GitHub
parent c6ec8f23bf d7dd050216
commit 8f9e9378e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/7055-kaovilai Normal file
View File

@ -0,0 +1 @@
restore: Use warning when Create IsAlreadyExist and Get error

4
pkg/restore/restore.go
View File

@ -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
}
}