feat: update to 20.03.0 ovn

2bcf0d28 · MengxinLiu · oilbeater · 7f782453 · 2bcf0d28 · 2bcf0d28
Commit 2bcf0d28 authored 5 years ago by MengxinLiu Committed by oilbeater 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 189 additions and 125 deletions
+189 -125
--- a/VERSION
+++ b/VERSION
-v1.0.0
+v1.1.0-pre
--- a/dist/images/Dockerfile.cni
+++ b/dist/images/Dockerfile.cni
@@ -10,19 +10,22 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel&& \
-        yum clean all
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm

-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all

-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1

+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

-RUN yum install -y tcpdump ipset && \
-        yum clean all
+RUN mkdir -p /var/run/openvswitch

 ENV CNI_VERSION=v0.7.5
 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap

--- a/dist/images/Dockerfile.controller
+++ b/dist/images/Dockerfile.controller
@@ -10,18 +10,20 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel&& \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

--- a/dist/images/Dockerfile.db
+++ b/dist/images/Dockerfile.db
@@ -10,18 +10,20 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

 RUN mkdir -p /var/run/openvswitch


--- a/dist/images/Dockerfile.node
+++ b/dist/images/Dockerfile.node
@@ -10,18 +10,22 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+
+RUN mkdir -p /var/run/openvswitch

 RUN mkdir -p /var/run/openvswitch && \
    mkdir -p /etc/cni/net.d && \

--- a/dist/images/Dockerfile.pinger
+++ b/dist/images/Dockerfile.pinger
@@ -10,18 +10,20 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

--- a/dist/images/Dockerfile.webhook
+++ b/dist/images/Dockerfile.webhook
@@ -10,18 +10,20 @@ RUN yum install -y  \
        libpcap \
        hostname \
        iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

--- a/dist/images/kubectl-ko
+++ b/dist/images/kubectl-ko
@@ -139,7 +139,7 @@ diagnose(){
        nodeName=$(kubectl get pod "$pinger" -n "$KUBE_OVN_NS" -o jsonpath={.spec.nodeName})
        echo "### start to diagnose node $nodeName"
        echo "#### ovn-controller log:"
-        kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/openvswitch/ovn-controller.log
+        kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/ovn/ovn-controller.log
        echo ""
        kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- /kube-ovn/kube-ovn-pinger --mode=job
        echo "### finish diagnose node $nodeName"
@@ -152,7 +152,7 @@ diagnose(){
      pinger=$(kubectl get pod -n $KUBE_OVN_NS -o wide | grep kube-ovn-pinger | grep " $nodeName " | awk '{print $1}')
      echo "### start to diagnose node nodeName"
      echo "#### ovn-controller log:"
-      kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/openvswitch/ovn-controller.log
+      kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/ovn/ovn-controller.log
      echo ""
      kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- /kube-ovn/kube-ovn-pinger --mode=job
      echo "### finish diagnose node nodeName"

--- a/dist/images/ovn-healthcheck.sh
+++ b/dist/images/ovn-healthcheck.sh
 #!/bin/bash
 set -euo pipefail

-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'

 ovn-ctl status_northd
 ovn-ctl status_ovnnb

--- a/dist/images/ovn-is-leader.sh
+++ b/dist/images/ovn-is-leader.sh
 #!/bin/bash
 set -euo pipefail

-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'

 ovn-ctl status_northd
 ovn-ctl status_ovnnb

--- a/dist/images/ovs-healthcheck.sh
+++ b/dist/images/ovs-healthcheck.sh
@@ -2,8 +2,7 @@
 set -euo pipefail

 alias ovs-ctl='/usr/share/openvswitch/scripts/ovs-ctl'
-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'

 ovs-ctl status
 ovn-ctl status_controller
-ovn-ctl status_controller_vtep
--- a/dist/images/start-db.sh
+++ b/dist/images/start-db.sh
@@ -36,25 +36,25 @@ function get_leader_ip {
 }

 function quit {
-    /usr/share/openvswitch/scripts/ovn-ctl stop_northd
+    /usr/share/ovn/scripts/ovn-ctl stop_northd
    exit 0
 }
 trap quit EXIT

 if [[ -z "$NODE_IPS" ]]; then
-    /usr/share/openvswitch/scripts/ovn-ctl restart_northd
+    /usr/share/ovn/scripts/ovn-ctl restart_northd
    ovn-nbctl set-connection ptcp:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
    ovn-nbctl set Connection . inactivity_probe=0
    ovn-sbctl set-connection ptcp:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
    ovn-sbctl set Connection . inactivity_probe=0
 else
-    /usr/share/openvswitch/scripts/ovn-ctl stop_northd
+    /usr/share/ovn/scripts/ovn-ctl stop_northd

    nb_leader_ip=$(get_leader_ip nb)
    sb_leader_ip=$(get_leader_ip sb)
    if [[ "$nb_leader_ip" == "${POD_IP}" ]]; then
        # Start ovn-northd, ovn-nb and ovn-sb
-        /usr/share/openvswitch/scripts/ovn-ctl \
+        /usr/share/ovn/scripts/ovn-ctl \
            --db-nb-create-insecure-remote=yes \
            --db-sb-create-insecure-remote=yes \
            --db-nb-cluster-local-addr="${POD_IP}" \
@@ -75,7 +75,7 @@ else
        done

        # Start ovn-northd, ovn-nb and ovn-sb
-        /usr/share/openvswitch/scripts/ovn-ctl \
+        /usr/share/ovn/scripts/ovn-ctl \
            --db-nb-create-insecure-remote=yes \
            --db-sb-create-insecure-remote=yes \
            --db-nb-cluster-local-addr="${POD_IP}" \
@@ -88,4 +88,4 @@ else
    fi
 fi

-tail -f /var/log/openvswitch/ovn-northd.log
+tail -f /var/log/ovn/ovn-northd.log
--- a/dist/images/start-ovs.sh
+++ b/dist/images/start-ovs.sh
@@ -29,7 +29,6 @@ wait_ovn_sb
 function quit {
 	/usr/share/openvswitch/scripts/ovs-ctl stop
 	/usr/share/openvswitch/scripts/ovn-ctl stop_controller
-	/usr/share/openvswitch/scripts/ovn-ctl stop_controller_vtep
 	exit 0
 }
 trap quit EXIT
@@ -50,8 +49,7 @@ fi
 /usr/share/openvswitch/scripts/ovs-ctl --protocol=udp --dport=6081 enable-protocol

 # Start ovn-controller
-/usr/share/openvswitch/scripts/ovn-ctl restart_controller
-/usr/share/openvswitch/scripts/ovn-ctl restart_controller_vtep
+/usr/share/ovn/scripts/ovn-ctl restart_controller

 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
@@ -59,4 +57,4 @@ ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
 ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
 ovs-vsctl set open . external-ids:ovn-encap-type=geneve

-tail -f /var/log/openvswitch/ovs-vswitchd.log
+tail -f /var/log/ovn/ovn-controller.log
--- a/pkg/pinger/ovn.go
+++ b/pkg/pinger/ovn.go
@@ -22,7 +22,7 @@ func checkOvs(config *Configuration) {
 }

 func checkOvnController(config *Configuration) {
-	output, err := exec.Command("/usr/share/openvswitch/scripts/ovn-ctl", "status_controller").CombinedOutput()
+	output, err := exec.Command("/usr/share/ovn/scripts/ovn-ctl", "status_controller").CombinedOutput()
 	if err != nil {
 		klog.Errorf("check ovn_controller status failed %v, %q", err, output)
 		SetOvnControllerDownMetrics(config.NodeName)

--- a/yamls/kube-ovn-ipv6.yaml
+++ b/yamls/kube-ovn-ipv6.yaml
@@ -39,7 +39,7 @@ spec:
      hostNetwork: true
      containers:
        - name: kube-ovn-controller
-          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          command:
            - /kube-ovn/start-controller.sh
@@ -110,7 +110,7 @@ spec:
      hostPID: true
      initContainers:
        - name: install-cni
-          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          command: ["/kube-ovn/install-cni.sh"]
          securityContext:
@@ -123,7 +123,7 @@ spec:
              name: cni-bin
      containers:
        - name: cni-server
-          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.1.0-pre"
          command: ["sh", "/kube-ovn/start-cniserver.sh"]
          args:
            - --enable-mirror=false
@@ -206,7 +206,7 @@ spec:
      hostPID: true
      containers:
        - name: pinger
-          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          securityContext:
            runAsUser: 0
@@ -236,13 +236,17 @@ spec:
              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          resources:
            requests:
              cpu: 100m
@@ -259,15 +263,21 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn
 ---
 kind: Service
 apiVersion: v1

--- a/yamls/kube-ovn.yaml
+++ b/yamls/kube-ovn.yaml
@@ -39,7 +39,7 @@ spec:
      hostNetwork: true
      containers:
        - name: kube-ovn-controller
-          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          command:
          - /kube-ovn/start-controller.sh
@@ -108,7 +108,7 @@ spec:
      hostPID: true
      initContainers:
      - name: install-cni
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.1.0-pre"
        imagePullPolicy: IfNotPresent
        command: ["/kube-ovn/install-cni.sh"]
        securityContext:
@@ -121,7 +121,7 @@ spec:
            name: cni-bin
      containers:
      - name: cni-server
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.1.0-pre"
        imagePullPolicy: IfNotPresent
        command:
          - sh
@@ -211,7 +211,7 @@ spec:
      hostPID: true
      containers:
        - name: pinger
-          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.1.0-pre"
          command: ["/kube-ovn/kube-ovn-pinger", "--external-address=114.114.114.114"]
          imagePullPolicy: IfNotPresent
          securityContext:
@@ -242,13 +242,17 @@ spec:
              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          resources:
            requests:
              cpu: 100m
@@ -265,15 +269,21 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn
 ---
 kind: Service
 apiVersion: v1

--- a/yamls/ovn-ha.yaml
+++ b/yamls/ovn-ha.yaml
@@ -155,7 +155,7 @@ spec:
      hostNetwork: true
      containers:
        - name: ovn-central
-          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          securityContext:
            capabilities:
@@ -180,17 +180,19 @@ spec:
              cpu: 500m
              memory: 300Mi
          volumeMounts:
-            - mountPath: /run/openvswitch
-              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          readinessProbe:
            exec:
              command:
@@ -200,8 +202,8 @@ spec:
          livenessProbe:
            exec:
              command:
-              - sh
-              - /root/ovn-healthcheck.sh
+                - sh
+                - /root/ovn-healthcheck.sh
            initialDelaySeconds: 30
            periodSeconds: 7
            failureThreshold: 5
@@ -212,15 +214,21 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn

 ---
 kind: DaemonSet
@@ -253,7 +261,7 @@ spec:
      hostPID: true
      containers:
        - name: openvswitch
-          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          securityContext:
            runAsUser: 0
@@ -267,28 +275,30 @@ spec:
            - mountPath: /lib/modules
              name: host-modules
              readOnly: true
-            - mountPath: /run/openvswitch
-              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          readinessProbe:
            exec:
              command:
-              - sh
-              - /root/ovs-healthcheck.sh
+                - sh
+                - /root/ovs-healthcheck.sh
            periodSeconds: 5
          livenessProbe:
            exec:
              command:
-              - sh
-              - /root/ovs-healthcheck.sh
+                - sh
+                - /root/ovs-healthcheck.sh
            initialDelaySeconds: 10
            periodSeconds: 5
            failureThreshold: 5
@@ -308,12 +318,18 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn
--- a/yamls/ovn.yaml
+++ b/yamls/ovn.yaml
@@ -156,7 +156,7 @@ spec:
      hostNetwork: true
      containers:
        - name: ovn-central
-          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          securityContext:
            capabilities:
@@ -179,17 +179,19 @@ spec:
              cpu: 500m
              memory: 300Mi
          volumeMounts:
-            - mountPath: /run/openvswitch
-              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          readinessProbe:
            exec:
              command:
@@ -211,15 +213,21 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn

 ---
 kind: DaemonSet
@@ -252,7 +260,7 @@ spec:
      hostPID: true
      containers:
        - name: openvswitch
-          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v1.0.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v1.1.0-pre"
          imagePullPolicy: IfNotPresent
          securityContext:
            runAsUser: 0
@@ -266,17 +274,19 @@ spec:
            - mountPath: /lib/modules
              name: host-modules
              readOnly: true
-            - mountPath: /run/openvswitch
-              name: host-run-ovs
            - mountPath: /var/run/openvswitch
              name: host-run-ovs
+            - mountPath: /var/run/ovn
+              name: host-run-ovn
            - mountPath: /sys
              name: host-sys
              readOnly: true
            - mountPath: /etc/openvswitch
              name: host-config-openvswitch
            - mountPath: /var/log/openvswitch
-              name: host-log
+              name: host-log-ovs
+            - mountPath: /var/log/ovn
+              name: host-log-ovn
          readinessProbe:
            exec:
              command:
@@ -307,12 +317,18 @@ spec:
        - name: host-run-ovs
          hostPath:
            path: /run/openvswitch
+        - name: host-run-ovn
+          hostPath:
+            path: /run/ovn
        - name: host-sys
          hostPath:
            path: /sys
        - name: host-config-openvswitch
          hostPath:
            path: /etc/origin/openvswitch
-        - name: host-log
+        - name: host-log-ovs
          hostPath:
            path: /var/log/openvswitch
+        - name: host-log-ovn
+          hostPath:
+            path: /var/log/ovn