modify taint

pkg/cluster-runtime/installer.go

@@ -32,7 +32,6 @@ import (
 	"github.com/sealerio/sealer/pkg/runtime/kubernetes"
 	"github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm"
 	v1 "github.com/sealerio/sealer/types/api/v1"
-	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -247,31 +246,30 @@ func (i *Installer) setNodeTaints(hosts []net.IP, driver runtime.Driver) error {
 			if err := infradriver.NewCreateTaints().FormatData(ip, taint); err != nil {
 				return err
 			}
-			if err := UpdateNodeTaint(ip, driver); err != nil {
+			node, err := UpdateNodeTaint(ip, driver)
+			if err != nil {
+				return err
+			}
+			if err := driver.Update(context.TODO(), &node); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 
-func UpdateNodeTaint(ip net.IP, driver runtime.Driver) error {
+func UpdateNodeTaint(ip net.IP, driver runtime.Driver) (corev1.Node, error) {
+	var node corev1.Node
 	nodeList := corev1.NodeList{}
 	if err := driver.List(context.TODO(), &nodeList); err != nil {
-		return fmt.Errorf("failed to list cluster nodes: %v", err)
-	}
-
-	for _, node := range nodeList.Items {
-		for _, v := range node.Status.Addresses {
-			updateTaints := infradriver.NewCreateTaints().UpdateTaints(node.Spec.Taints, ip.String())
-			if updateTaints != nil {
-				node.Spec.Taints = updateTaints
-				if err := driver.Update(context.TODO(), &node); err != nil {
-					return err
-				}
-				logrus.Infof("succeed in updating node(%s) taints to %v", v.Address, updateTaints)
-			}
+		return corev1.Node{}, fmt.Errorf("failed to list cluster nodes: %v", err)
+	}
+
+	for _, node = range nodeList.Items {
+		updateTaints := infradriver.NewCreateTaints().UpdateTaints(node.Spec.Taints, ip.String())
+		if updateTaints != nil {
+			node.Spec.Taints = updateTaints
 		}
 	}
-	return nil
+	return node, nil
 }