From 3177d26fc4eefd77fb1a7f248ec2cb8739e6bab4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 11:09:32 +0800 Subject: [PATCH] Fix: skipGC remove labels for multi-cluster resource not use correct ctx (#4622) Signed-off-by: Somefive (cherry picked from commit c59755b6a48b493672fccf41a4855ad762c59321) Co-authored-by: Somefive --- pkg/resourcekeeper/gc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/resourcekeeper/gc.go b/pkg/resourcekeeper/gc.go index 683753edd..636426857 100644 --- a/pkg/resourcekeeper/gc.go +++ b/pkg/resourcekeeper/gc.go @@ -352,7 +352,7 @@ func (h *gcHandler) deleteManagedResource(ctx context.Context, mr v1beta1.Manage delete(labels, oam.LabelAppNamespace) entry.obj.SetLabels(labels) } - return errors.Wrapf(h.Client.Update(ctx, entry.obj), "failed to remove owner labels for resource while skipping gc") + return errors.Wrapf(h.Client.Update(_ctx, entry.obj), "failed to remove owner labels for resource while skipping gc") } if err := h.Client.Delete(_ctx, entry.obj); err != nil && !kerrors.IsNotFound(err) { return errors.Wrapf(err, "failed to delete resource %s", mr.ResourceKey())