mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-29 19:25:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6136 from ywk253100/230412_mf_main

Browse Source 
Ignore not found error during patching managedFields
This commit is contained in:
Daniel Jiang
2023-04-17 12:47:43 +08:00
committed by GitHub
parent 65f99c1264 b4aa0b8f5f
commit f6a27f8585
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/6136-ywk253100
+1
View File
@@ -0,0 +1 @@
Ignore not found error during patching managedFields
pkg/restore/restore.go
+6 -3
View File
@@ -1514,10 +1514,13 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
if patchBytes != nil {
if _, err = resourceClient.Patch(name, patchBytes); err != nil {
ctx.log.Errorf("error patch for managed fields %s: %v", kube.NamespaceAndName(obj), err)
errs.Add(namespace, err)
return warnings, errs, itemExists
if !apierrors.IsNotFound(err) {
errs.Add(namespace, err)
return warnings, errs, itemExists
}
} else {
ctx.log.Infof("the managed fields for %s is patched", kube.NamespaceAndName(obj))
}
ctx.log.Infof("the managed fields for %s is patched", kube.NamespaceAndName(obj))
}
if groupResource == kuberesource.Pods {