fix: enable switch available during cluster join

ONE7live · ONE7live · commit 3f3aea175e80 · 2024-11-20T19:27:35.000+08:00
Signed-off-by: ONE7live &lt;wangqi_yewu@cmss.chinamobile.com&gt;
diff --git a/pkg/clusterlink/clusterlink-operator/operator_controller.go b/pkg/clusterlink/clusterlink-operator/operator_controller.go
@@ -138,7 +138,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 	//}
 
 	cluster := &v1alpha1.Cluster{}
-
 	if err := r.Client.Get(ctx, request.NamespacedName, cluster); err != nil {
 		// The resource may no longer exist, in which case we stop processing.
 		if apierrors.IsNotFound(err) {
@@ -154,5 +153,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 		}
 	}
 
+	if !cluster.Spec.ClusterLinkOptions.Enable {
+		klog.Infof("cluster %v does not have the clusterlink module enabled, skipping this event.", cluster.Name)
+		return reconcile.Result{}, nil
+	}
+
 	return r.syncCluster(cluster)
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (`
`138`	`138`	`//}`
`139`	`139`
`140`	`140`	`cluster := &v1alpha1.Cluster{}`
`141`		`-`
`142`	`141`	`if err := r.Client.Get(ctx, request.NamespacedName, cluster); err != nil {`
`143`	`142`	`// The resource may no longer exist, in which case we stop processing.`
`144`	`143`	`if apierrors.IsNotFound(err) {`
`@@ -154,5 +153,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (`
`154`	`153`	`}`
`155`	`154`	`}`
`156`	`155`
	`156`	`+ if !cluster.Spec.ClusterLinkOptions.Enable {`
	`157`	`+ klog.Infof("cluster %v does not have the clusterlink module enabled, skipping this event.", cluster.Name)`
	`158`	`+ return reconcile.Result{}, nil`
	`159`	`+ }`
	`160`	`+`
`157`	`161`	`return r.syncCluster(cluster)`
`158`	`162`	`}`