agent: do not add taint for edge node (#20) (#21)

Author: SataQiu

pkg/controllers/agent/yurtcluster_controller.go

@@ -163,9 +163,6 @@ func (r *YurtClusterReconciler) reconcileEdgeNode(ctx context.Context, yurtClust
 		return ctrl.Result{}, errors.Errorf("can not convert node %q because it is in NotReady status", node.Name)
 	}
 
-	// add edge taint
-	util.EnsureEdgeTaintForNode(node)
-
 	// add edge label for node
 	node.Labels[projectinfo.GetEdgeWorkerLabelKey()] = "true"
 
@@ -177,9 +174,6 @@ func (r *YurtClusterReconciler) reconcileNormalNode(ctx context.Context, yurtClu
 		return ctrl.Result{}, nil
 	}
 
-	// remove edge taint if exists
-	util.RemoveEdgeTaintForNode(node)
-
 	// remove edge label from node labels
 	delete(node.Labels, projectinfo.GetEdgeWorkerLabelKey())
 

pkg/util/kubernetes.go

@@ -48,12 +48,6 @@ const (
 	// SkipReconcileAnnotation defines the annotation which marks the object should not be reconciled
 	SkipReconcileAnnotation = "operator.openyurt.io/skip-reconcile"
 
-	// EdgeNodeTaintKey defines the taint key for edge node
-	EdgeNodeTaintKey = "node-role.openyurt.io/edge"
-
-	// EdgeNodeTaintEffect defines the taint effect for edge node
-	EdgeNodeTaintEffect = "NoSchedule"
-
 	// ControlPlaneLabel defines the label for control-plane node
 	ControlPlaneLabel = "node-role.kubernetes.io/master"
 )
@@ -350,34 +344,3 @@ func GetYurtComponentImageByType(yurtCluster *operatorv1alpha1.YurtCluster, imag
 	}
 	return fmt.Sprintf("%s/%s:%s", repository, name, tag)
 }
-
-// EnsureEdgeTaintForNode adds edge taint for node
-func EnsureEdgeTaintForNode(node *corev1.Node) {
-	found := false
-	for _, taint := range node.Spec.Taints {
-		if taint.Key == EdgeNodeTaintKey && taint.Effect == EdgeNodeTaintEffect {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		taint := corev1.Taint{
-			Key:    EdgeNodeTaintKey,
-			Effect: EdgeNodeTaintEffect,
-		}
-		node.Spec.Taints = append(node.Spec.Taints, taint)
-	}
-}
-
-// RemoveEdgeTaintForNode removes edge taint for node
-func RemoveEdgeTaintForNode(node *corev1.Node) {
-	var newTaints []corev1.Taint
-	for _, taint := range node.Spec.Taints {
-		if taint.Key == EdgeNodeTaintKey && taint.Effect == EdgeNodeTaintEffect {
-			continue
-		}
-		newTaints = append(newTaints, taint)
-	}
-	node.Spec.Taints = newTaints
-}