From 283e7065948518eec8c7fba2d071e5dc91012e8d Mon Sep 17 00:00:00 2001 From: Joaquim Moreno Date: Fri, 29 Jul 2022 19:35:49 +0200 Subject: [PATCH] fixup! Refactor the use of syncTarget Name for syncTargetKey --- pkg/syncer/spec/spec_process.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/syncer/spec/spec_process.go b/pkg/syncer/spec/spec_process.go index 6abd178eb978..56cc03130439 100644 --- a/pkg/syncer/spec/spec_process.go +++ b/pkg/syncer/spec/spec_process.go @@ -258,8 +258,7 @@ func (c *Controller) ensureSyncerFinalizer(ctx context.Context, gvr schema.Group upstreamFinalizers = append(upstreamFinalizers, shared.SyncerFinalizerNamePrefix+c.syncTargetKey) upstreamObjCopy.SetFinalizers(upstreamFinalizers) - if _, err := c.upstreamClient.Cluster(logicalCluster).Resource(gvr).Namespace(namespace).Patch(ctx, name, types.MergePatchType, []byte(`{"metadata":{"finalizers":["`+shared.SyncerFinalizerNamePrefix+c.syncTargetKey+`"]}}`), metav1.PatchOptions{}); err != nil { - //if _, err := c.upstreamClient.Cluster(logicalCluster).Resource(gvr).Namespace(namespace).Update(ctx, upstreamObjCopy, metav1.UpdateOptions{}); err != nil { + if _, err := c.upstreamClient.Cluster(logicalCluster).Resource(gvr).Namespace(namespace).Update(ctx, upstreamObjCopy, metav1.UpdateOptions{}); err != nil { klog.Errorf("Failed adding finalizer upstream on resource %s|%s/%s: %v", logicalCluster, namespace, name, err) return err }