fix: lint error

kubeovn · Feb 24, 2021 · a537985 · a537985
1 parent d0d3e89
commit a537985
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -222,7 +222,7 @@ func (c *Controller) handleAddNode(key string) error {
 	}
 
 	// There is only one nodeAddr temp
-	nodeAddr := util.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)

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -91,7 +91,7 @@ func NewController(config *Configuration, podInformerFactory informers.SharedInf
 		return nil, err
 	}
 	controller.protocol = util.CheckProtocol(node.Annotations[util.IpAddressAnnotation])
-	controller.internalIP = util.GetNodeInternalIP(node)
+	controller.internalIP = util.GetNodeInternalIP(*node)
 
 	controller.iptable = make(map[string]*iptables.IPTables)
 	controller.ipset = make(map[string]*ipsets.IPSets)

diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go
@@ -113,7 +113,7 @@ func (c *Controller) setIptables() error {
 		return err
 	}
 
-	hostIP := util.GetNodeInternalIP(node)
+	hostIP := util.GetNodeInternalIP(*node)
 
 	var (
 		v4Rules = []util.IPTableRule{

diff --git a/pkg/util/k8s.go b/pkg/util/k8s.go
@@ -2,7 +2,7 @@ package util
 
 import v1 "k8s.io/api/core/v1"
 
-func GetNodeInternalIP(node *v1.Node) string {
+func GetNodeInternalIP(node v1.Node) string {
 	var nodeAddr string
 	for _, addr := range node.Status.Addresses {
 		if addr.Type == v1.NodeInternalIP {

diff --git a/test/e2e/service/service.go b/test/e2e/service/service.go
@@ -50,7 +50,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := util.GetNodeInternalIP(&node)
+				nodeIP := util.GetNodeInternalIP(node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, hostService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -77,7 +77,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := util.GetNodeInternalIP(&node)
+				nodeIP := util.GetNodeInternalIP(node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, containerService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -104,7 +104,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := util.GetNodeInternalIP(&node)
+				nodeIP := util.GetNodeInternalIP(node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, containerService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -131,7 +131,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := util.GetNodeInternalIP(&node)
+				nodeIP := util.GetNodeInternalIP(node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, hostService.Spec.Ports[0].NodePort), "-o", "/dev/null",