refactor: reduce duplicated function

(cherry picked from commit 9eee6f9)

pkg/controller/node.go

@@ -222,7 +222,7 @@ func (c *Controller) handleAddNode(key string) error {
 	}
 
 	// There is only one nodeAddr temp
-	nodeAddr := getNodeInternalIP(node)
+	nodeAddr := util.GetNodeInternalIP(node)
 	for _, ip := range strings.Split(ipStr, ",") {
 		if util.CheckProtocol(nodeAddr) == util.CheckProtocol(ip) {
 			err = c.ovnClient.AddStaticRoute("", nodeAddr, ip, c.config.ClusterRouter)
@@ -337,17 +337,6 @@ func gatewayContains(gatewayNodeStr, gateway string) bool {
 	return false
 }
 
-func getNodeInternalIP(node *v1.Node) string {
-	var nodeAddr string
-	for _, addr := range node.Status.Addresses {
-		if addr.Type == v1.NodeInternalIP {
-			nodeAddr = addr.Address
-			break
-		}
-	}
-	return nodeAddr
-}
-
 func (c *Controller) createOrUpdateCrdIPs(key, ip, mac string) error {
 	v4IP, v6IP := util.SplitStringIP(ip)
 	ipCr, err := c.config.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), fmt.Sprintf("node-%s", key), metav1.GetOptions{})

pkg/daemon/controller.go

@@ -58,17 +58,6 @@ type Controller struct {
 	internalIP string
 }
 
-func getNodeInternalIP(node *v1.Node) string {
-	var nodeAddr string
-	for _, addr := range node.Status.Addresses {
-		if addr.Type == v1.NodeInternalIP {
-			nodeAddr = addr.Address
-			break
-		}
-	}
-	return nodeAddr
-}
-
 // NewController init a daemon controller
 func NewController(config *Configuration, podInformerFactory informers.SharedInformerFactory, nodeInformerFactory informers.SharedInformerFactory, kubeovnInformerFactory kubeovninformer.SharedInformerFactory) (*Controller, error) {
 	eventBroadcaster := record.NewBroadcaster()
@@ -102,7 +91,7 @@ func NewController(config *Configuration, podInformerFactory informers.SharedInf
 		return nil, err
 	}
 	controller.protocol = util.CheckProtocol(node.Annotations[util.IpAddressAnnotation])
-	controller.internalIP = getNodeInternalIP(node)
+	controller.internalIP = util.GetNodeInternalIP(node)
 
 	controller.iptable = make(map[string]*iptables.IPTables)
 	controller.ipset = make(map[string]*ipsets.IPSets)

pkg/util/k8s.go

@@ -0,0 +1,14 @@
+package util
+
+import v1 "k8s.io/api/core/v1"
+
+func GetNodeInternalIP(node *v1.Node) string {
+	var nodeAddr string
+	for _, addr := range node.Status.Addresses {
+		if addr.Type == v1.NodeInternalIP {
+			nodeAddr = addr.Address
+			break
+		}
+	}
+	return nodeAddr
+}