Skip to content

Commit 8d0d15d

Browse files
authored
Merge pull request #8902 from sseago/warn-managed-fields-patch
For not found errors on managed fields, add restore warning
2 parents 4d10047 + 6b630f7 commit 8d0d15d

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

changelogs/unreleased/8902-sseago

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Warn for not found error in patching managed fields

pkg/restore/restore.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,11 +1704,13 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
17041704
}
17051705
if patchBytes != nil {
17061706
if _, err = resourceClient.Patch(obj.GetName(), patchBytes); err != nil {
1707-
restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error())
17081707
if !apierrors.IsNotFound(err) {
1708+
restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error())
17091709
errs.Add(namespace, err)
17101710
return warnings, errs, itemExists
17111711
}
1712+
restoreLogger.Warnf("item not found when patching managed fields %s: %s", kube.NamespaceAndName(obj), err.Error())
1713+
warnings.Add(namespace, err)
17121714
} else {
17131715
restoreLogger.Infof("the managed fields for %s is patched", kube.NamespaceAndName(obj))
17141716
}

0 commit comments

Comments
 (0)