fix: use ovn-appctl to do recompute

kubeovn · Mar 19, 2020 · 2814a1d · 2814a1d
1 parent 51e3515
commit 2814a1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -601,6 +601,8 @@ spec:
         volumeMounts:
           - mountPath: /run/openvswitch
             name: host-run-ovs
+          - mountPath: /run/ovn
+            name: host-run-ovn
           - mountPath: /var/run/netns
             name: host-ns
             mountPropagation: HostToContainer
@@ -630,6 +632,9 @@ spec:
         - name: host-run-ovs
           hostPath:
             path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
         - name: cni-conf
           hostPath:
             path: /etc/cni/net.d

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -353,7 +353,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 }
 
 func recompute() {
-	output, err := exec.Command("ovs-appctl", "-t", "ovn-controller", "recompute").CombinedOutput()
+	output, err := exec.Command("ovn-appctl", "-t", "ovn-controller", "recompute").CombinedOutput()
 	if err != nil {
 		klog.Errorf("failed to recompute ovn-controller %q", output)
 	}

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -143,6 +143,8 @@ spec:
         volumeMounts:
           - mountPath: /run/openvswitch
             name: host-run-ovs
+          - mountPath: /run/ovn
+            name: host-run-ovn
           - mountPath: /var/run/netns
             name: host-ns
             mountPropagation: HostToContainer
@@ -172,6 +174,9 @@ spec:
         - name: host-run-ovs
           hostPath:
             path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
         - name: cni-conf
           hostPath:
             path: /etc/cni/net.d