From 898fa13ed765b12c44f38d50a7dd646ffa78d6bc Mon Sep 17 00:00:00 2001 From: Shubham Pampattiwar Date: Mon, 27 Oct 2025 11:57:55 -0700 Subject: [PATCH] Fix managed fields patch for resources using GenerateName When restoring resources with GenerateName (where name is empty and K8s assigns the actual name), the managed fields patch was failing with error "name is required" because it was using obj.GetName() which returns empty for GenerateName resources. The fix uses createdObj.GetName() instead, which contains the actual name assigned by Kubernetes after resource creation. This affects any resource using GenerateName for restore, including: - PersistentVolumeClaims restored by kubevirt-velero-plugin - Secrets and ConfigMaps created with generateName - Any custom resources using generateName Changes: - Line 1707: Use createdObj.GetName() instead of obj.GetName() in Patch call - Lines 1702, 1709, 1713, 1716: Use createdObj in error/info messages for accuracy This is a backwards-compatible fix since: - For resources WITHOUT generateName: obj.GetName() == createdObj.GetName() - For resources WITH generateName: createdObj.GetName() has the actual name The managed fields patch was already correctly using createdObj (lines 1698-1700), only the Patch() call was incorrectly using obj. Fixes restore status showing FinalizingPartiallyFailed with "name is required" error when restoring resources with GenerateName. Signed-off-by: Shubham Pampattiwar --- pkg/restore/restore.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index c8a9ab40a..7e0fe7f9a 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -1699,21 +1699,21 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso createdObj.SetManagedFields(obj.GetManagedFields()) patchBytes, err := generatePatch(withoutManagedFields, createdObj) if err != nil { - restoreLogger.Errorf("error generating patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error()) + restoreLogger.Errorf("error generating patch for managed fields %s: %s", kube.NamespaceAndName(createdObj), err.Error()) errs.Add(namespace, err) return warnings, errs, itemExists } if patchBytes != nil { - if _, err = resourceClient.Patch(obj.GetName(), patchBytes); err != nil { + if _, err = resourceClient.Patch(createdObj.GetName(), patchBytes); err != nil { if !apierrors.IsNotFound(err) { - restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(obj), err.Error()) + restoreLogger.Errorf("error patch for managed fields %s: %s", kube.NamespaceAndName(createdObj), 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()) + restoreLogger.Warnf("item not found when patching managed fields %s: %s", kube.NamespaceAndName(createdObj), err.Error()) warnings.Add(namespace, err) } else { - restoreLogger.Infof("the managed fields for %s is patched", kube.NamespaceAndName(obj)) + restoreLogger.Infof("the managed fields for %s is patched", kube.NamespaceAndName(createdObj)) } }