fix: add filtering conditions

Signed-off-by: OrangeBao <[email protected]>
OrangeBao · Nov 28, 2023 · 4dbad83 · 4dbad83
1 parent 3dd1de9
commit 4dbad83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/clusterlink/agent/app/agent.go b/cmd/clusterlink/agent/app/agent.go
@@ -118,6 +118,7 @@ func run(ctx context.Context, opts *options.Options) error {
 
 	autoDetectController := linkagent.AutoDetectReconciler{
 		Client:      mgr.GetClient(),
+		NodeName:    os.Getenv(utils.EnvNodeName),
 		ClusterName: os.Getenv(utils.EnvClusterName),
 	}
 

diff --git a/pkg/clusterlink/agent-manager/auto_detect_controller.go b/pkg/clusterlink/agent-manager/auto_detect_controller.go
@@ -18,6 +18,7 @@ import (
 
 	kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
 	"github.com/kosmos.io/kosmos/pkg/clusterlink/agent-manager/autodetection"
+	"github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/node"
 	"github.com/kosmos.io/kosmos/pkg/clusterlink/network"
 )
 
@@ -29,6 +30,7 @@ const (
 type AutoDetectReconciler struct {
 	client.Client
 	ClusterName string
+	NodeName    string
 }
 
 func (r *AutoDetectReconciler) SetupWithManager(mgr manager.Manager) error {
@@ -42,7 +44,8 @@ func (r *AutoDetectReconciler) SetupWithManager(mgr manager.Manager) error {
 			return false
 		}
 
-		if eventObj.Spec.ClusterName != r.ClusterName {
+		if eventObj.Name != node.ClusterNodeName(r.ClusterName, r.NodeName) {
+			klog.V(4).Infof("skip event, reconcile node name: %s, current node name: %s-%s", eventObj.Name, r.ClusterName, r.NodeName)
 			return false
 		}