Skip to content

Commit

Permalink
feat: update ovn to 2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@oilbeater
oilbeater committed Apr 25, 2019
1 parent 1ec972f commit 5a8958c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.0
v0.4.0-pre
14 changes: 8 additions & 6 deletions dist/images/Dockerfile.cni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ RUN yum install -y \
hostname \
ipset \
iproute strace socat nc \
unbound unbound-devel && \
unbound unbound-devel python-openvswitch libreswan && \
yum clean all

ENV OVS_VERSION=2.10.1
ENV OVS_SUBVERSION=2
ENV OVS_VERSION=2.11.1
ENV OVS_SUBVERSION=1
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

RUN rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm
RUN rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-ipsec-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

COPY start-cniserver.sh /kube-ovn/start-cniserver.sh
COPY install-cni.sh /kube-ovn/install-cni.sh
Expand Down
20 changes: 11 additions & 9 deletions dist/images/Dockerfile.controller
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ RUN yum install -y \
libpcap \
hostname \
iproute strace socat nc \
unbound unbound-devel && \
unbound unbound-devel python-openvswitch libreswan && \
yum clean all

ENV OVS_VERSION=2.10.1
ENV OVS_SUBVERSION=2
ENV OVS_VERSION=2.11.1
ENV OVS_SUBVERSION=1

RUN rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm
RUN rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-ipsec-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

RUN mkdir -p /var/run/openvswitch
WORKDIR /kube-ovn
Expand Down
20 changes: 11 additions & 9 deletions dist/images/Dockerfile.node
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ RUN yum install -y \
libpcap \
hostname \
iproute strace socat nc \
unbound unbound-devel && \
unbound unbound-devel python-openvswitch libreswan && \
yum clean all

ENV OVS_VERSION=2.10.1
ENV OVS_SUBVERSION=2
ENV OVS_VERSION=2.11.1
ENV OVS_SUBVERSION=1

RUN rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm && \
rpm -i https://github.com/oilbeater/ovs/releases/download/v${OVS_VERSION}/openvswitch-ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.centos.x86_64.rpm
RUN rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-ipsec-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-common-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
rpm -ivh https://github.com/alauda/ovs/releases/download/v${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm

RUN mkdir -p /var/run/openvswitch && \
mkdir -p /etc/cni/net.d && \
Expand Down
6 changes: 0 additions & 6 deletions pkg/ovs/ovn-nbctl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@ func (c Client) DeleteStaticRouter(cidr, router string) error {
func (c Client) FindLoadbalancer(lb string) (string, error) {
output, err := c.ovnNbCommand("--data=bare", "--no-heading", "--columns=_uuid",
"find", "load_balancer", fmt.Sprintf("name=%s", lb))

// deal with ovn-nbctl daemon format bug
if strings.Contains(output, " ") {
part := strings.Split(output, " ")
output = part[len(part)-1]
}
return output, err
}

Expand Down

0 comments on commit 5a8958c

Please sign in to comment.