fixup! Refactor the use of syncTarget Name for syncTargetKey

kcp-dev · Aug 1, 2022 · 283e706 · 283e706
1 parent aa880cd
commit 283e706
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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
 		}