From 1105b83b88749819c7636542e14a269d802c034c Mon Sep 17 00:00:00 2001 From: "Szekeres, Balazs (Nokia - HU/Budapest)" Date: Wed, 8 May 2019 09:42:41 +0200 Subject: [PATCH] DANM version update - DANM version changed to 3.3.0 Change-Id: Ia3116acaea993de2b2f9f6d1df4f3cf3ebb6557b Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) --- SPECS/caas-danm.spec | 6 +++--- SPECS/caas-netwatcher.spec | 4 ++-- SPECS/caas-svcwatcher.spec | 4 ++-- docker-build/cni-builder/Dockerfile | 3 ++- docker-build/netwatcher/Dockerfile | 1 + docker-build/svcwatcher/Dockerfile | 1 + 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec index 42ab482..156ad07 100644 --- a/SPECS/caas-danm.spec +++ b/SPECS/caas-danm.spec @@ -14,10 +14,10 @@ %define COMPONENT danm %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 3.2.0 +%define RPM_MAJOR_VERSION 3.3.0 %define RPM_MINOR_VERSION 1 +%define DANM_VERSION v%{RPM_MAJOR_VERSION} %define CNI_VERSION 0.7.0 -%define DANM_VERSION b48eb154a7f81fcafb0ff9e5b7d3ca6b54e6565a %define go_version 1.12.1 %define SRIOV_VERSION 6b53446e5781570c44e399cccb1fcdfa417f43a1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -87,7 +87,7 @@ rsync -av cni-config/flannel.conf %{buildroot}/etc/cni/net.d/flannel.conf mkdir -p %{buildroot}/opt/cni/bin/ # Generic CNI plugins # Don't use the standard ipvlan binary \ -# Dont't use portmap, quick fix for CVE-2019-9946 \ +# Don't use portmap, quick fix for CVE-2019-9946 \ rsync -av \ --chmod=go+rx,u+rwx \ --exclude=ipvlan \ diff --git a/SPECS/caas-netwatcher.spec b/SPECS/caas-netwatcher.spec index 70f7151..408093d 100644 --- a/SPECS/caas-netwatcher.spec +++ b/SPECS/caas-netwatcher.spec @@ -14,9 +14,9 @@ %define COMPONENT netwatcher %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 3.2.0 +%define RPM_MAJOR_VERSION 3.3.0 %define RPM_MINOR_VERSION 1 -%define DANM_VERSION b48eb154a7f81fcafb0ff9e5b7d3ca6b54e6565a +%define DANM_VERSION v%{RPM_MAJOR_VERSION} %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/SPECS/caas-svcwatcher.spec b/SPECS/caas-svcwatcher.spec index f7a244d..4414f76 100644 --- a/SPECS/caas-svcwatcher.spec +++ b/SPECS/caas-svcwatcher.spec @@ -14,9 +14,9 @@ %define COMPONENT svcwatcher %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 3.2.0 +%define RPM_MAJOR_VERSION 3.3.0 %define RPM_MINOR_VERSION 1 -%define DANM_VERSION b48eb154a7f81fcafb0ff9e5b7d3ca6b54e6565a +%define DANM_VERSION v%{RPM_MAJOR_VERSION} %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/docker-build/cni-builder/Dockerfile b/docker-build/cni-builder/Dockerfile index d6cb0d7..c00d157 100644 --- a/docker-build/cni-builder/Dockerfile +++ b/docker-build/cni-builder/Dockerfile @@ -49,7 +49,8 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n && mkdir -p $GOPATH/src/github.com/nokia \ && git clone https://github.com/nokia/danm.git $GOPATH/src/github.com/nokia/danm \ && cd $GOPATH/src/github.com/nokia/danm \ -&& git checkout ${NETWATCHER_VERSION} \ +&& git fetch --tags \ +&& git checkout ${DANM_VERSION} \ && glide install --strip-vendor \ && go get -d github.com/vishvananda/netlink \ && go get github.com/containernetworking/plugins/pkg/ns \ diff --git a/docker-build/netwatcher/Dockerfile b/docker-build/netwatcher/Dockerfile index 45343e6..85168a7 100644 --- a/docker-build/netwatcher/Dockerfile +++ b/docker-build/netwatcher/Dockerfile @@ -34,6 +34,7 @@ RUN apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide gi && mkdir -p $GOPATH/src/github.com/nokia \ && git clone https://github.com/nokia/danm.git $GOPATH/src/github.com/nokia/danm \ && cd $GOPATH/src/github.com/nokia/danm \ +&& git fetch --tags \ && git checkout ${NETWATCHER_VERSION} \ && glide install --strip-vendor \ && go get -d github.com/vishvananda/netlink \ diff --git a/docker-build/svcwatcher/Dockerfile b/docker-build/svcwatcher/Dockerfile index aefaae6..03cdc28 100644 --- a/docker-build/svcwatcher/Dockerfile +++ b/docker-build/svcwatcher/Dockerfile @@ -34,6 +34,7 @@ RUN apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide gi && mkdir -p $GOPATH/src/github.com/nokia \ && git clone https://github.com/nokia/danm.git $GOPATH/src/github.com/nokia/danm \ && cd $GOPATH/src/github.com/nokia/danm \ +&& git fetch --tags \ && git checkout ${SVCWATCHER_VERSION} \ && glide install --strip-vendor \ && go get -d github.com/vishvananda/netlink \ -- 2.16.6