feat: add a way to exclude nodes

Signed-off-by: wangyizhi1 <[email protected]>
wangyizhi1 · Nov 24, 2023 · 79fa5e3 · 79fa5e3
1 parent e923865
commit 79fa5e3
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/deploy/clusterlink-elector.yml b/deploy/clusterlink-elector.yml
@@ -21,6 +21,23 @@ spec:
       labels:
         app: elector
     spec:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: kosmos.io/exclude
+                  operator: DoesNotExist
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - elector
+            namespaces:
+              - kosmos-system
+            topologyKey: kubernetes.io/hostname
       containers:
         - command:
             - clusterlink-elector

diff --git a/pkg/clusterlink/controllers/node/node_controller.go b/pkg/clusterlink/controllers/node/node_controller.go
@@ -43,15 +43,15 @@ type Reconciler struct {
 var predicatesFunc = predicate.Funcs{
 	CreateFunc: func(createEvent event.CreateEvent) bool {
 		node := createEvent.Object.(*corev1.Node)
-		return !utils.IsKosmosNode(node)
+		return !utils.IsKosmosNode(node) && !utils.IsExcludeNode(node)
 	},
 	UpdateFunc: func(updateEvent event.UpdateEvent) bool {
 		node := updateEvent.ObjectNew.(*corev1.Node)
-		return !utils.IsKosmosNode(node)
+		return !utils.IsKosmosNode(node) && !utils.IsExcludeNode(node)
 	},
 	DeleteFunc: func(deleteEvent event.DeleteEvent) bool {
 		node := deleteEvent.Object.(*corev1.Node)
-		return !utils.IsKosmosNode(node)
+		return !utils.IsKosmosNode(node) && !utils.IsExcludeNode(node)
 	},
 	GenericFunc: func(genericEvent event.GenericEvent) bool {
 		return false

diff --git a/pkg/operator/clusterlink/elector/manifests.go b/pkg/operator/clusterlink/elector/manifests.go
@@ -33,6 +33,12 @@ spec:
     spec:
       serviceAccountName: {{ .Name }}
       affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: kosmos.io/exclude
+                operator: DoesNotExist
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:

diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go
@@ -76,6 +76,8 @@ const (
 	KosmosSelectorKey      = "kosmos.io/cluster-selector"
 	KosmosTrippedLabels    = "kosmos-io/tripped"
 	KosmosPvcLabelSelector = "kosmos-io/label-selector"
+	KosmosExcludeNodeLabel = "kosmos.io/exclude"
+	KosmosExcludeNodeValue = "true"
 
 	// on resorce (pv, configmap, secret), represents which cluster this resource belongs to
 	KosmosResourceOwnersAnnotations = "kosmos-io/cluster-owners"

diff --git a/pkg/utils/k8s.go b/pkg/utils/k8s.go
@@ -218,6 +218,17 @@ func IsKosmosNode(node *corev1.Node) bool {
 	return labelVal == KosmosNodeValue
 }
 
+func IsExcludeNode(node *corev1.Node) bool {
+	if node == nil {
+		return false
+	}
+	labelVal, exist := node.ObjectMeta.Labels[KosmosExcludeNodeLabel]
+	if !exist {
+		return false
+	}
+	return labelVal == KosmosExcludeNodeValue
+}
+
 func IsVirtualPod(pod *corev1.Pod) bool {
 	if pod.Labels != nil && pod.Labels[KosmosPodLabel] == "true" {
 		return true