Merge pull request kosmos-io#189 from wangyizhi1/main

fix: clusterlink ignore kosmos nodes

Author: kosmos-robot

deploy/clustertree-cluster-manager.yml

@@ -0,0 +1,56 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clustertree
+  namespace: kosmos-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: clustertree
+rules:
+  - apiGroups: ['*']
+    resources: ['*']
+    verbs: ["*"]
+  - nonResourceURLs: ['*']
+    verbs: ["get"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: clustertree
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: clustertree
+subjects:
+  - kind: ServiceAccount
+    name: clustertree
+    namespace: kosmos-system
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: clustertree-cluster-manager
+  namespace: kosmos-system
+  labels:
+    app: clustertree-cluster-manager
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: clustertree-cluster-manager
+  template:
+    metadata:
+      labels:
+        app: clustertree-cluster-manager
+    spec:
+      serviceAccountName: clustertree
+      containers:
+        - name: clustertree-cluster-manager
+          image: ghcr.io/kosmos-io/clustertree-cluster-manager:__VERSION__
+          imagePullPolicy: Always
+          command:
+            - clustertree-cluster-manager
+            - --multi-cluster-service=true
+            - --v=4

deploy/clustertree-knode-controllers.yml

@@ -23,6 +23,7 @@ import (
 
 	clusterlinkv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
 	"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
+	"github.com/kosmos.io/kosmos/pkg/utils"
 	interfacepolicy "github.com/kosmos.io/kosmos/pkg/utils/interface-policy"
 )
 
@@ -41,16 +42,19 @@ type Reconciler struct {
 
 var predicatesFunc = predicate.Funcs{
 	CreateFunc: func(createEvent event.CreateEvent) bool {
-		return true
+		node := createEvent.Object.(*corev1.Node)
+		return !utils.IsKosmosNode(node)
 	},
 	UpdateFunc: func(updateEvent event.UpdateEvent) bool {
-		return true
+		node := updateEvent.ObjectNew.(*corev1.Node)
+		return !utils.IsKosmosNode(node)
 	},
 	DeleteFunc: func(deleteEvent event.DeleteEvent) bool {
-		return true
+		node := deleteEvent.Object.(*corev1.Node)
+		return !utils.IsKosmosNode(node)
 	},
 	GenericFunc: func(genericEvent event.GenericEvent) bool {
-		return true
+		return false
 	},
 }
 

pkg/clusterlink/controllers/node/node_controller.go

@@ -315,15 +315,15 @@ func NewMetricClientFromByte(kubeConfig []byte, opts ...Opts) (versioned.Interfa
 	return metricClient, nil
 }
 
-func IsVirtualNode(node *corev1.Node) bool {
+func IsKosmosNode(node *corev1.Node) bool {
 	if node == nil {
 		return false
 	}
-	valStr, exist := node.ObjectMeta.Labels[KosmosNodeLabel]
+	labelVal, exist := node.ObjectMeta.Labels[KosmosNodeLabel]
 	if !exist {
 		return false
 	}
-	return valStr == KosmosNodeValue
+	return labelVal == KosmosNodeValue
 }
 
 func IsVirtualPod(pod *corev1.Pod) bool {