Use k8s hostname, fix #60

kubeovn · Jul 11, 2019 · 1e5c9f6 · 1e5c9f6
1 parent 0b0cce4
commit 1e5c9f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/controller/election.go b/pkg/controller/election.go
@@ -79,7 +79,7 @@ func setupLeaderElection(config *leaderElectionConfig) *leaderelection.LeaderEle
 	}
 
 	broadcaster := record.NewBroadcaster()
-	hostname, _ := os.Hostname()
+	hostname := os.Getenv("KUBE_NODE_NAME")
 
 	recorder := broadcaster.NewRecorder(scheme.Scheme, apiv1.EventSource{
 		Component: ovnLeaderElector,

diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go
@@ -112,7 +112,7 @@ LOOP:
 
 func (c *Controller) getLocalPodIPsNeedNAT() ([]string, error) {
 	var localPodIPs []string
-	hostname, _ := os.Hostname()
+	hostname := os.Getenv("KUBE_NODE_NAME")
 	allPods, err := c.podsLister.List(labels.Everything())
 	if err != nil {
 		klog.Errorf("list pods failed, %+v", err)

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -55,6 +55,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           readinessProbe:
             exec:
               command: