fix: use nodeName as chassis hostname

kubeovn · Sep 2, 2020 · e986144 · e986144
1 parent 290e7ba
commit e986144
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 3 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -521,6 +521,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules
@@ -921,6 +925,10 @@ spec:
                   fieldPath: status.podIP
             - name: HW_OFFLOAD
               value: "$HW_OFFLOAD"
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -637,6 +637,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules
@@ -1038,6 +1042,10 @@ spec:
                   fieldPath: status.podIP
             - name: HW_OFFLOAD
               value: "$HW_OFFLOAD"
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules

diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
@@ -55,13 +55,14 @@ fi
 /usr/share/openvswitch/scripts/ovs-ctl restart --no-ovsdb-server  --system-id=random
 /usr/share/openvswitch/scripts/ovs-ctl --protocol=udp --dport=6081 enable-protocol
 
-# Start ovn-controller
-/usr/share/ovn/scripts/ovn-ctl restart_controller
-
 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote=tcp:"[${OVN_SB_SERVICE_HOST}]":"${OVN_SB_SERVICE_PORT}"
 ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
 ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
 ovs-vsctl set open . external-ids:ovn-encap-type=geneve
+ovs-vsctl set open . external-ids:hostname="${KUBE_NODE_NAME}"
+
+# Start ovn-controller
+/usr/share/ovn/scripts/ovn-ctl restart_controller
 
 tail -f /var/log/ovn/ovn-controller.log
diff --git a/pkg/controller/ovn-ic.go b/pkg/controller/ovn-ic.go
@@ -147,6 +147,9 @@ func (c *Controller) establishInterConnection(config map[string]string) error {
 			klog.Errorf("failed to get gw %s chassisID, %v", gw, err)
 			return err
 		}
+		if chassisID == "" {
+			return fmt.Errorf("no chassisID for gw %s", gw)
+		}
 		chassises = append(chassises, chassisID)
 	}
 

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -282,6 +282,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules

diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
@@ -317,6 +317,10 @@ spec:
                   fieldPath: status.podIP
             - name: HW_OFFLOAD
               value: "false"
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules

diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml
@@ -315,6 +315,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: KUBE_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             - name: HW_OFFLOAD
               value: "false"
           volumeMounts: