chore: remove ovs-ipsec and update go to 1.13

python-openvswitch doesn't exist in yum repo now, clean it along with ovs-ipsec.
kubeovn · Sep 19, 2019 · e27c9e5 · e27c9e5
1 parent 8f4149c
commit e27c9e5
Show file tree

Hide file tree

Showing 34 changed files with 305 additions and 6,726 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 GOFILES_NOVENDOR=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
-GO_VERSION=1.12
+GO_VERSION=1.13
 
 REGISTRY=index.alauda.cn/alaudak8s
 ROLES=node controller cni db webhook

diff --git a/dist/images/Dockerfile.cni b/dist/images/Dockerfile.cni
@@ -1,30 +1,33 @@
 FROM centos:7
 
-RUN yum install -y \
-        PyYAML \
-        bind-utils \
+ENV PYTHONDONTWRITEBYTECODE yes
+
+RUN yum install -y  \
+        PyYAML bind-utils \
         openssl \
         numactl-libs \
         firewalld-filesystem \
         libpcap \
         hostname \
-        ipset \
         iproute strace socat nc \
-        unbound unbound-devel python-openvswitch libreswan && \
+        unbound unbound-devel&& \
         yum clean all
 
 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 ./portmap
 
 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
 
+
+RUN yum install -y tcpdump ipset && \
+        yum clean all
+
+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
+
 COPY start-cniserver.sh /kube-ovn/start-cniserver.sh
 COPY install-cni.sh /kube-ovn/install-cni.sh
 COPY 00-kube-ovn.conflist /kube-ovn/00-kube-ovn.conflist

diff --git a/dist/images/Dockerfile.controller b/dist/images/Dockerfile.controller
@@ -10,14 +10,13 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel python-openvswitch libreswan && \
+        unbound unbound-devel&& \
         yum clean all
 
 ENV OVS_VERSION=2.11.1
 ENV OVS_SUBVERSION=1
 
 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 && \

diff --git a/dist/images/Dockerfile.db b/dist/images/Dockerfile.db
@@ -10,14 +10,13 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel python-openvswitch libreswan && \
+        unbound unbound-devel && \
         yum clean all
 
 ENV OVS_VERSION=2.11.1
 ENV OVS_SUBVERSION=1
 
 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 && \

diff --git a/dist/images/Dockerfile.node b/dist/images/Dockerfile.node
@@ -10,14 +10,13 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel python-openvswitch libreswan && \
+        unbound unbound-devel && \
         yum clean all
 
 ENV OVS_VERSION=2.11.1
 ENV OVS_SUBVERSION=1
 
 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 && \
@@ -29,9 +28,6 @@ RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /etc/cni/net.d && \
     mkdir -p /opt/cni/bin
 
-RUN yum install -y tcpdump && \
-        yum clean all
-
 COPY ovs-healthcheck.sh /root/ovs-healthcheck.sh
 COPY start-ovs.sh /root/start-ovs.sh
 

diff --git a/dist/images/Dockerfile.webhook b/dist/images/Dockerfile.webhook
@@ -10,14 +10,13 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel python-openvswitch libreswan && \
+        unbound unbound-devel && \
         yum clean all
 
 ENV OVS_VERSION=2.11.1
 ENV OVS_SUBVERSION=1
 
 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 && \

diff --git a/go.sum b/go.sum
@@ -240,7 +240,7 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo=
+gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4=
 gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

diff --git a/pkg/daemon/config.go b/pkg/daemon/config.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"os/exec"
@@ -54,8 +53,8 @@ func ParseFlags() (*Configuration, error) {
 		argPprofPort             = pflag.Int("pprof-port", 10665, "The port to get profiling data, default: 10665")
 	)
 
-	// mute log for ipset lib
-	logrus.SetOutput(ioutil.Discard)
+	// mute info log for ipset lib
+	logrus.SetLevel(logrus.WarnLevel)
 
 	flag.Set("alsologtostderr", "true")