From 7af1d2f3b103810502ca7953d2a757405964adae Mon Sep 17 00:00:00 2001
From: michaelawyu <chenyu1@microsoft.com>
Date: Wed, 15 Jan 2025 21:04:37 +0800
Subject: [PATCH] Minor fixes
---
pkg/controllers/workapplier/apply.go | 12 ++++++------
.../workapplier/drift_detection_takeover.go | 8 ++++----
pkg/controllers/workapplier/preprocess.go | 12 ++++++------
pkg/controllers/workapplier/process.go | 6 +++---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pkg/controllers/workapplier/apply.go b/pkg/controllers/workapplier/apply.go
index 5fa4a6c88..bfe92ea9d 100644
--- a/pkg/controllers/workapplier/apply.go
+++ b/pkg/controllers/workapplier/apply.go
@@ -181,8 +181,8 @@ func (r *Reconciler) createManifestObject(
}
createdObj, err := r.spokeDynamicClient.Resource(*gvr).Namespace(manifestObject.GetNamespace()).Create(ctx, manifestObject, createOpts)
if err != nil {
- _ = controller.NewAPIServerError(false, err)
- return nil, fmt.Errorf("failed to create manifest object: %w", err)
+ wrappedErr := controller.NewAPIServerError(false, err)
+ return nil, fmt.Errorf("failed to create manifest object: %w", wrappedErr)
}
return createdObj, nil
}
@@ -240,8 +240,8 @@ func (r *Reconciler) threeWayMergePatch(
Resource(*gvr).Namespace(manifestObj.GetNamespace()).
Patch(ctx, manifestObj.GetName(), patch.Type(), data, patchOpts)
if err != nil {
- _ = controller.NewAPIServerError(false, err)
- return nil, fmt.Errorf("failed to patch the manifest object: %w", err)
+ wrappedErr := controller.NewAPIServerError(false, err)
+ return nil, fmt.Errorf("failed to patch the manifest object: %w", wrappedErr)
}
return patchedObj, nil
}
@@ -282,8 +282,8 @@ func (r *Reconciler) serverSideApply(
Resource(*gvr).Namespace(manifestObj.GetNamespace()).
Apply(ctx, manifestObj.GetName(), manifestObj, applyOpts)
if err != nil {
- _ = controller.NewAPIServerError(false, err)
- return nil, fmt.Errorf("failed to apply the manifest object: %w", err)
+ wrappedErr := controller.NewAPIServerError(false, err)
+ return nil, fmt.Errorf("failed to apply the manifest object: %w", wrappedErr)
}
return appliedObj, nil
}
diff --git a/pkg/controllers/workapplier/drift_detection_takeover.go b/pkg/controllers/workapplier/drift_detection_takeover.go
index f8a2d3c33..b02cddcf9 100644
--- a/pkg/controllers/workapplier/drift_detection_takeover.go
+++ b/pkg/controllers/workapplier/drift_detection_takeover.go
@@ -95,8 +95,8 @@ func (r *Reconciler) takeOverPreExistingObject(
Resource(*gvr).Namespace(inMemberClusterObjCopy.GetNamespace()).
Update(ctx, inMemberClusterObjCopy, metav1.UpdateOptions{})
if err != nil {
- _ = controller.NewAPIServerError(false, err)
- return nil, nil, fmt.Errorf("failed to take over the object: %w", err)
+ wrappedErr := controller.NewAPIServerError(false, err)
+ return nil, nil, fmt.Errorf("failed to take over the object: %w", wrappedErr)
}
return takenOverInMemberClusterObj, nil, nil
@@ -312,8 +312,8 @@ func (r *Reconciler) removeLeftBehindAppliedWorkOwnerRefs(ctx context.Context, o
switch {
case err != nil && !errors.IsNotFound(err):
// An unexpected error occurred.
- _ = controller.NewAPIServerError(true, err)
- return nil, fmt.Errorf("failed to get the Work object: %w", err)
+ wrappedErr := controller.NewAPIServerError(true, err)
+ return nil, fmt.Errorf("failed to get the Work object: %w", wrappedErr)
case err == nil:
// The AppliedWork owner reference is valid; no need for removal.
//
diff --git a/pkg/controllers/workapplier/preprocess.go b/pkg/controllers/workapplier/preprocess.go
index 066b3a848..f02b31511 100644
--- a/pkg/controllers/workapplier/preprocess.go
+++ b/pkg/controllers/workapplier/preprocess.go
@@ -454,8 +454,8 @@ func (r *Reconciler) removeOneLeftOverManifest(
return nil
case err != nil:
// Failed to retrieve the object from the member cluster.
- _ = controller.NewAPIServerError(true, err)
- return fmt.Errorf("failed to retrieve the object from the member cluster (gvr=%+v, manifestObj=%+v): %w", gvr, klog.KRef(manifestNamespace, manifestName), err)
+ wrappedErr := controller.NewAPIServerError(true, err)
+ return fmt.Errorf("failed to retrieve the object from the member cluster (gvr=%+v, manifestObj=%+v): %w", gvr, klog.KRef(manifestNamespace, manifestName), wrappedErr)
case inMemberClusterObj.GetDeletionTimestamp() != nil:
// The object has been marked for deletion; no further action is needed.
return nil
@@ -485,9 +485,9 @@ func (r *Reconciler) removeOneLeftOverManifest(
removeOwnerRef(inMemberClusterObj, expectedAppliedWorkOwnerRef)
if _, err := r.spokeDynamicClient.Resource(gvr).Namespace(manifestNamespace).Update(ctx, inMemberClusterObj, metav1.UpdateOptions{}); err != nil && !apierrors.IsNotFound(err) {
// Failed to drop the ownership.
- _ = controller.NewAPIServerError(false, err)
+ wrappedErr := controller.NewAPIServerError(false, err)
return fmt.Errorf("failed to drop the ownership of the object (gvr=%+v, manifestObj=%+v, inMemberClusterObj=%+v, expectedAppliedWorkOwnerRef=%+v): %w",
- gvr, klog.KRef(manifestNamespace, manifestName), klog.KObj(inMemberClusterObj), *expectedAppliedWorkOwnerRef, err)
+ gvr, klog.KRef(manifestNamespace, manifestName), klog.KObj(inMemberClusterObj), *expectedAppliedWorkOwnerRef, wrappedErr)
}
default:
// Fleet is the sole owner of the object; in this case, Fleet will delete the object.
@@ -510,9 +510,9 @@ func (r *Reconciler) removeOneLeftOverManifest(
}
if err := r.spokeDynamicClient.Resource(gvr).Namespace(manifestNamespace).Delete(ctx, manifestName, deleteOpts); err != nil && !apierrors.IsNotFound(err) {
// Failed to delete the object from the member cluster.
- _ = controller.NewAPIServerError(false, err)
+ wrappedErr := controller.NewAPIServerError(false, err)
return fmt.Errorf("failed to delete the object (gvr=%+v, manifestObj=%+v, inMemberClusterObj=%+v, expectedAppliedWorkOwnerRef=%+v): %w",
- gvr, klog.KRef(manifestNamespace, manifestName), klog.KObj(inMemberClusterObj), *expectedAppliedWorkOwnerRef, err)
+ gvr, klog.KRef(manifestNamespace, manifestName), klog.KObj(inMemberClusterObj), *expectedAppliedWorkOwnerRef, wrappedErr)
}
}
return nil
diff --git a/pkg/controllers/workapplier/process.go b/pkg/controllers/workapplier/process.go
index 64cdde036..44a154cd2 100644
--- a/pkg/controllers/workapplier/process.go
+++ b/pkg/controllers/workapplier/process.go
@@ -173,10 +173,10 @@ func (r *Reconciler) findInMemberClusterObjectFor(
return false
default:
// An unexpected error has occurred.
- _ = controller.NewAPIServerError(true, err)
- bundle.applyErr = fmt.Errorf("failed to find the corresponding object for the manifest object in the member cluster: %w", err)
+ wrappedErr := controller.NewAPIServerError(true, err)
+ bundle.applyErr = fmt.Errorf("failed to find the corresponding object for the manifest object in the member cluster: %w", wrappedErr)
bundle.applyResTyp = ManifestProcessingApplyResultTypeFailedToFindObjInMemberCluster
- klog.ErrorS(err,
+ klog.ErrorS(wrappedErr,
"Failed to find the corresponding object for the manifest object in the member cluster",
"work", klog.KObj(work), "GVR", *bundle.gvr, "manifestObj", klog.KObj(bundle.manifestObj),
"expectedAppliedWorkOwnerRef", *expectedAppliedWorkOwnerRef)