Merge pull request #645 from alauda/chore/upate-ovs-ovn

chore: update ovn to 20.12 and ovs to 2.15
kubeovn · Jan 17, 2021 · c991579 · c991579
2 parents 1ab8713 + 3713b25
commit c991579
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile
@@ -12,21 +12,21 @@ RUN apt update && apt install build-essential git libnuma-dev autoconf curl \
     flake8 python3-sphinx graphviz groff -y
 
 RUN cd /usr/src/ && \
-    git clone -b branch-2.14 --depth=1 https://github.com/openvswitch/ovs.git && \
+    git clone -b branch-2.15 --depth=1 https://github.com/openvswitch/ovs.git && \
     cd ovs && \
     curl https://github.com/alauda/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \
     curl https://github.com/alauda/ovs/commit/8dd4973bba021ce92eb9f42446d6c1c0e3474e25.patch | git apply && \
-    sed -i 's/2.14.1/2.14.0/g' configure.ac && \
+
     ./boot.sh && \
     rm -rf .git && \
     DATAPATH_CONFIGURE_OPTS='--prefix=/usr --enable-shared' DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
 
-RUN cd /usr/src/ && git clone -b branch-20.09 --depth=1 https://github.com/ovn-org/ovn.git && \
+RUN cd /usr/src/ && git clone -b branch-20.12 --depth=1 https://github.com/ovn-org/ovn.git && \
     cd ovn && \
     curl https://github.com/alauda/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \
-    curl https://github.com/alauda/ovn/commit/34d7031d999418a79f1f79e2a7d5ecd17fa6f84c.patch | git apply && \
-    curl https://github.com/alauda/ovn/commit/11ec3f14cebe08ce556d5a8c0ee1cc14686f953d.patch | git apply && \
-    curl https://github.com/alauda/ovn/commit/113cf2e3c10b210a410b9ef41f981d321785d8df.patch | git apply && \
+    curl https://github.com/alauda/ovn/commit/e19ff25f2464e67127c7eb1edef44803aa4a5462.patch | git apply && \
+    curl https://github.com/alauda/ovn/commit/289c62e3fcd05901dac4b727aa59f6cba058905f.patch | git apply && \
+    curl https://github.com/alauda/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \
     sed -i 's/OVN/ovn/g' debian/changelog && \
     rm -rf .git && \
     ./boot.sh && \

diff --git a/pkg/daemon/ovs.go b/pkg/daemon/ovs.go
@@ -283,7 +283,7 @@ func configureNodeNic(portName, ip, gw string, macAddr net.HardwareAddr, mtu int
 			return err
 		}
 	} else {
-		output, err = exec.Command("ping6",  "-w", "10", gw).CombinedOutput()
+		output, err = exec.Command("ping6", "-w", "10", gw).CombinedOutput()
 		if err != nil {
 			klog.Errorf("ovn0 failed to ping gw %s, %v", gw, err)
 			return err