network policy should use internal address for contiv client

network policy should use internal address instead for interacting with contiv.
contiv · Jan 10, 2018 · 92cd7d5 · 92cd7d5
1 parent a04b4ae
commit 92cd7d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/netmaster/daemon/daemon.go b/netmaster/daemon/daemon.go
@@ -523,7 +523,7 @@ func (d *MasterDaemon) InitServices() {
 		isLeader := func() bool {
 			return d.currState == "leader"
 		}
-		networkpolicy.InitK8SServiceWatch(d.ListenURL, isLeader)
+		networkpolicy.InitK8SServiceWatch(d.ControlURL, isLeader)
 	}
 }
 

diff --git a/netmaster/k8snetwork/networkpolicy.go b/netmaster/k8snetwork/networkpolicy.go
@@ -373,14 +373,11 @@ func (k8sNet *k8sContext) watchK8sEvents(errChan chan error) {
 }
 
 // InitK8SServiceWatch monitor k8s services
-func InitK8SServiceWatch(listenURL string, isLeader func() bool) error {
+func InitK8SServiceWatch(listenAddr string, isLeader func() bool) error {
 	npLog = log.WithField("k8s", "netpolicy")
 
-	listenAddr := strings.Split(listenURL, ":")
-	if len(listenAddr[0]) <= 0 {
-		listenAddr[0] = "localhost"
-	}
-	contivClient, err := client.NewContivClient("http://" + listenAddr[0] + ":" + listenAddr[1])
+	npLog.Infof("Create contiv client at http://%s", listenAddr)
+	contivClient, err := client.NewContivClient("http://" + listenAddr)
 	if err != nil {
 		npLog.Errorf("failed to create contivclient %s", err)
 		return err