cni-bin-dir,cni-conf-dir configurable

Fix https://github.com/alauda/kube-ovn/issues/655

dist/images/install-pre-1.16.sh

@@ -7,6 +7,9 @@ ENABLE_MIRROR=${ENABLE_MIRROR:-false}
 HW_OFFLOAD=${HW_OFFLOAD:-false}
 IFACE=""                               # The nic to support container network can be a nic name or a group of regex separated by comma, if empty will use the nic that the default route use
 
+CNI_CONF_DIR="/etc/cni/net.d"
+CNI_BIN_DIR="/opt/cni/bin"
+
 REGISTRY="kubeovn"
 VERSION="v1.7.0"
 IMAGE_PULL_POLICY="IfNotPresent"
@@ -1662,10 +1665,10 @@ spec:
             path: /run/ovn
         - name: cni-conf
           hostPath:
-            path: /etc/cni/net.d
+            path: $CNI_CONF_DIR
         - name: cni-bin
           hostPath:
-            path: /opt/cni/bin
+            path: $CNI_BIN_DIR
         - name: host-ns
           hostPath:
             path: /var/run/netns

dist/images/install.sh

@@ -8,6 +8,9 @@ ENABLE_MIRROR=${ENABLE_MIRROR:-false}
 HW_OFFLOAD=${HW_OFFLOAD:-false}
 IFACE=""                               # The nic to support container network can be a nic name or a group of regex separated by comma, if empty will use the nic that the default route use
 
+CNI_CONF_DIR="/etc/cni/net.d"
+CNI_BIN_DIR="/opt/cni/bin"
+
 REGISTRY="kubeovn"
 VERSION="v1.7.0"
 IMAGE_PULL_POLICY="IfNotPresent"
@@ -1700,10 +1703,10 @@ spec:
             path: /run/ovn
         - name: cni-conf
           hostPath:
-            path: /etc/cni/net.d
+            path: $CNI_CONF_DIR
         - name: cni-bin
           hostPath:
-            path: /opt/cni/bin
+            path: $CNI_BIN_DIR
         - name: host-ns
           hostPath:
             path: /var/run/netns

dist/images/uninstall.sh

@@ -44,5 +44,7 @@ rm -rf /etc/openvswitch/*
 rm -rf /etc/ovn/*
 rm -rf /var/log/openvswitch/*
 rm -rf /var/log/ovn/*
+# default
 rm -rf /etc/cni/net.d/00-kube-ovn.conflist
+# default
 rm -rf /etc/cni/net.d/01-kube-ovn.conflist

docs/install.md

@@ -169,7 +169,9 @@ You can use `--default-cidr` flags below to config default Pod CIDR or create a
     rm -rf /var/run/ovn
     rm -rf /etc/origin/openvswitch/
     rm -rf /etc/origin/ovn/
+    # default value
     rm -rf /etc/cni/net.d/00-kube-ovn.conflist
+    # default value
     rm -rf /etc/cni/net.d/01-kube-ovn.conflist
     rm -rf /var/log/openvswitch
     rm -rf /var/log/ovn

docs/local-files.md

@@ -5,5 +5,5 @@ Kube-OVN will store files to the host filesystem. Administrators should take car
 * `/etc/origin/ovn` and `/etc/origin/openvswitch` store the OVN and OVS db files. These files store the logical network topology.
 * `/var/run/ovn` and `/var/run/openvswitch` store the OVN and OVS socket files. These files provide endpoints to OVN/OVS control plane.
 * `/var/log/ovn` and `/var/log/openvswitch` store the log files of OVN and OVS.
-* `/etc/cni/net.d` stores the Kube-OVN CNI conf.
-* `/etc/cni/bin` stores the Kube-OVN CNI binary. 
+* `/etc/cni/net.d` stores the Kube-OVN CNI conf, you can config this path when install.
+* `/etc/cni/bin` stores the Kube-OVN CNI binary, you can config this path when install.