From ea9b4f37f3cbda289359f120aff1cdfbb4012b0c Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Fri, 2 May 2025 14:58:22 -0400 Subject: [PATCH] For not found errors on managed fields, add restore warning Signed-off-by: Scott Seago --- changelogs/unreleased/8916-sseago | 1 + pkg/restore/restore.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/8916-sseago diff --git a/changelogs/unreleased/8916-sseago b/changelogs/unreleased/8916-sseago new file mode 100644 index 000000000..d05aa5c9c --- /dev/null +++ b/changelogs/unreleased/8916-sseago @@ -0,0 +1 @@ +Warn for not found error in patching managed fields diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index a94cc4689..6f225ff3f 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -1704,11 +1704,13 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso } if patchBytes != nil { if _, err = resourceClient.Patch(obj.GetName(), patchBytes); err != nil { - restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error()) if !apierrors.IsNotFound(err) { + restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error()) errs.Add(namespace, err) return warnings, errs, itemExists } + restoreLogger.Warnf("item not found when patching managed fields %s: %s", kube.NamespaceAndName(obj), err.Error()) + warnings.Add(namespace, err) } else { restoreLogger.Infof("the managed fields for %s is patched", kube.NamespaceAndName(obj)) }