fix: improve cni-conf name priority

kubeovn · Aug 2, 2019 · 8a57747 · 8a57747
1 parent 40c05db
commit 8a57747
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/dist/images/kube-ovn.conflist → dist/images/00-kube-ovn.conflist b/dist/images/kube-ovn.conflist → dist/images/00-kube-ovn.conflist
diff --git a/dist/images/Dockerfile.cni b/dist/images/Dockerfile.cni
@@ -27,7 +27,7 @@ RUN rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${O
 
 COPY start-cniserver.sh /kube-ovn/start-cniserver.sh
 COPY install-cni.sh /kube-ovn/install-cni.sh
-COPY kube-ovn.conflist /kube-ovn/kube-ovn.conflist
+COPY 00-kube-ovn.conflist /kube-ovn/00-kube-ovn.conflist
 
 WORKDIR /kube-ovn
 CMD ["sh", "start-cniserver.sh"]

diff --git a/dist/images/install-cni.sh b/dist/images/install-cni.sh
@@ -10,8 +10,8 @@ exit_with_error(){
 CNI_BIN_SRC=/kube-ovn/kube-ovn
 CNI_BIN_DST=/opt/cni/bin/kube-ovn
 
-CNI_CONF_SRC=/kube-ovn/kube-ovn.conflist
-CNI_CONF_DST=/etc/cni/net.d/kube-ovn.conflist
+CNI_CONF_SRC=/kube-ovn/00-kube-ovn.conflist
+CNI_CONF_DST=/etc/cni/net.d/00-kube-ovn.conflist
 
 LOOPBACK_BIN_SRC=/loopback
 LOOPBACK_BIN_DST=/opt/cni/bin/loopback

diff --git a/docs/install.md b/docs/install.md
@@ -89,5 +89,6 @@ If you want to enable IPv6 on default subnet and node subnet, please apply https
     rm -rf /var/run/openvswitch
     rm -rf /etc/origin/openvswitch/
     rm -rf /etc/openvswitch
+    rm -rf /etc/cni/net.d/00-kube-ovn.conflist
     ```
 3. Reboot the Node to remove ipset/iptables rules and nics.