Merge branch 'vmware-tanzu:release-1.10' into release-1.10

changelogs/unreleased/6086-Lyndon-Li

@@ -0,0 +1 @@
+Fix issue #5972, don't assume errorField as error type when dealing with logger.WithError

changelogs/unreleased/6135-ywk253100

@@ -0,0 +1 @@
+Ignore not found error during patching managedFields

pkg/restore/restore.go

@@ -1434,10 +1434,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
+			if !apierrors.IsNotFound(err) {
+				errs.Add(namespace, err)
+				return warnings, errs
+			}
+		} 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 {

pkg/util/logging/log_counter_hook.go

@@ -71,7 +71,7 @@ func (h *LogHook) Fire(entry *logrus.Entry) error {
 		entryMessage = fmt.Sprintf("%s name: /%s", entryMessage, nameField.(string))
 	}
 	if isErrorFieldPresent {
-		entryMessage = fmt.Sprintf("%s error: /%s", entryMessage, errorField.(error).Error())
+		entryMessage = fmt.Sprintf("%s error: /%v", entryMessage, errorField)
 	}
 
 	if isNamespacePresent {