reuse func getNodeIP

This commit is contained in:
Weibin Lin
2018-10-08 16:39:31 +08:00
parent a34123d9c3
commit 0d57ec2938
5 changed files with 21 additions and 38 deletions

View File

@@ -18,11 +18,9 @@ package kubemark
import (
"fmt"
"net"
"time"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
@@ -90,7 +88,7 @@ func NewHollowProxyOrDie(
0,
"10.0.0.0/8",
nodeName,
getNodeIP(client, nodeName),
utilnode.GetNodeIP(client, nodeName),
recorder,
nil,
[]string{},
@@ -138,18 +136,3 @@ func (hp *HollowProxy) Run() {
glog.Fatalf("Error while running proxy: %v\n", err)
}
}
func getNodeIP(client clientset.Interface, hostname string) net.IP {
var nodeIP net.IP
node, err := client.CoreV1().Nodes().Get(hostname, metav1.GetOptions{})
if err != nil {
glog.Warningf("Failed to retrieve node info: %v", err)
return nil
}
nodeIP, err = utilnode.GetNodeHostIP(node)
if err != nil {
glog.Warningf("Failed to retrieve node IP: %v", err)
return nil
}
return nodeIP
}