fix: mount etc/origin/ovn to ovs-ovn

(cherry picked from commit d061fc3)
kubeovn · Apr 10, 2020 · 1424793 · 1424793
1 parent 83f3a92
commit 1424793
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -404,6 +404,8 @@ spec:
               readOnly: true
             - mountPath: /etc/openvswitch
               name: host-config-openvswitch
+            - mountPath: /etc/ovn
+              name: host-config-ovn
             - mountPath: /var/log/openvswitch
               name: host-log-ovs
             - mountPath: /var/log/ovn
@@ -447,6 +449,9 @@ spec:
         - name: host-config-openvswitch
           hostPath:
             path: /etc/origin/openvswitch
+        - name: host-config-ovn
+          hostPath:
+            path: /etc/origin/ovn
         - name: host-log-ovs
           hostPath:
             path: /var/log/openvswitch

diff --git a/docs/install.md b/docs/install.md
@@ -115,16 +115,14 @@ You can use `--default-cidr` flags below to config default Pod CIDR or create a
     bash cleanup.sh
     ```
 
-For version before v1.1 you need the following steps
-
 2. Delete OVN/OVS DB and config files on every Node:
 
     ```bash
     rm -rf /var/run/openvswitch
     rm -rf /etc/origin/openvswitch/
-    rm -rf /etc/openvswitch
+    rm -rf /etc/origin/ovn/
     rm -rf /etc/cni/net.d/00-kube-ovn.conflist
-   rm -rf /etc/cni/net.d/01-kube-ovn.conflist
+    rm -rf /etc/cni/net.d/01-kube-ovn.conflist
     rm -rf /var/log/openvswitch
     ```
 3. Reboot the Node to remove ipset/iptables rules and nics.
diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
@@ -291,6 +291,8 @@ spec:
               readOnly: true
             - mountPath: /etc/openvswitch
               name: host-config-openvswitch
+            - mountPath: /etc/ovn
+              name: host-config-ovn
             - mountPath: /var/log/openvswitch
               name: host-log-ovs
             - mountPath: /var/log/ovn
@@ -334,6 +336,9 @@ spec:
         - name: host-config-openvswitch
           hostPath:
             path: /etc/origin/openvswitch
+        - name: host-config-ovn
+          hostPath:
+            path: /etc/origin/ovn
         - name: host-log-ovs
           hostPath:
             path: /var/log/openvswitch

diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml
@@ -285,6 +285,8 @@ spec:
               readOnly: true
             - mountPath: /etc/openvswitch
               name: host-config-openvswitch
+            - mountPath: /etc/ovn
+              name: host-config-ovn
             - mountPath: /var/log/openvswitch
               name: host-log-ovs
             - mountPath: /var/log/ovn
@@ -328,6 +330,9 @@ spec:
         - name: host-config-openvswitch
           hostPath:
             path: /etc/origin/openvswitch
+        - name: host-config-ovn
+          hostPath:
+            path: /etc/origin/ovn
         - name: host-log-ovs
           hostPath:
             path: /var/log/openvswitch