From 9993b55e627f9418a7015ebe1eea73870d65eba7 Mon Sep 17 00:00:00 2001
From: Krisztian Lengyel <krisztian.lengyel@nokia.com>
Date: Mon, 26 Aug 2019 16:02:42 +0200
Subject: [PATCH] Update DANM

Update DANM to hash 5e15d4e322fc5ff89b06ac70bd83b5ce4c09d0df

Change-Id: I6c40a8ad6021e672077e0d931b6a4e3ded6c4785
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>
---
 SPECS/caas-danm.spec      | 8 ++++----
 SPECS/caas-hyperdanm.spec | 4 ++--
 cni-config/00-danm.conf   | 1 +
 cni-config/flannel.conf   | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec
index b0a5560..5655a68 100644
--- a/SPECS/caas-danm.spec
+++ b/SPECS/caas-danm.spec
@@ -15,9 +15,9 @@
 %define COMPONENT danm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.0.0
-%define RPM_MINOR_VERSION 2
-%define DANM_VERSION v%{RPM_MAJOR_VERSION}
-%define CNI_VERSION 0.7.0
+%define RPM_MINOR_VERSION 3
+%define DANM_VERSION 5e15d4e322fc5ff89b06ac70bd83b5ce4c09d0df
+%define CNI_VERSION 0.8.1
 %define go_version 1.12.1
 %define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
@@ -52,7 +52,7 @@ This RPM contains the DANM and related CNI binaries for CaaS subsystem.
 
 %build
 mkdir -p %{binary_build_dir}/cni
-curl -fsSL -k https://github.com/containernetworking/plugins/releases/download/v%{CNI_VERSION}/cni-plugins-amd64-v%{CNI_VERSION}.tgz  | tar zx --strip-components=1 -C %{binary_build_dir}/cni
+curl -fsSL -k https://github.com/containernetworking/plugins/releases/download/v%{CNI_VERSION}/cni-plugins-linux-amd64-v%{CNI_VERSION}.tgz  | tar zx --strip-components=1 -C %{binary_build_dir}/cni
 
 # Build DANM binaries
 docker build \
diff --git a/SPECS/caas-hyperdanm.spec b/SPECS/caas-hyperdanm.spec
index 91d02a0..cd5dfc8 100644
--- a/SPECS/caas-hyperdanm.spec
+++ b/SPECS/caas-hyperdanm.spec
@@ -15,8 +15,8 @@
 %define COMPONENT hyperdanm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.0.0
-%define RPM_MINOR_VERSION 0
-%define DANM_VERSION v%{RPM_MAJOR_VERSION}
+%define RPM_MINOR_VERSION 1
+%define DANM_VERSION 5e15d4e322fc5ff89b06ac70bd83b5ce4c09d0df
 %define go_version 1.12.1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define danm_components netwatcher svcwatcher webhook
diff --git a/cni-config/00-danm.conf b/cni-config/00-danm.conf
index 79c18d0..be94e8f 100644
--- a/cni-config/00-danm.conf
+++ b/cni-config/00-danm.conf
@@ -1,6 +1,7 @@
 {
   "name": "meta_cni",
   "type": "danm",
+  "cniVersion": "0.3.1",
   "kubeconfig": "/etc/kubernetes/kubeconfig/danmc.yml",
   "cniDir": "/etc/cni/net.d"
 }
diff --git a/cni-config/flannel.conf b/cni-config/flannel.conf
index 1e842d3..8109a62 100644
--- a/cni-config/flannel.conf
+++ b/cni-config/flannel.conf
@@ -1,8 +1,9 @@
 {
   "name": "cbr0",
   "type": "flannel",
+  "cniVersion": "0.3.1",
   "delegate": {
     "hairpinMode": true,
     "isDefaultGateway": true
   }
-}
\ No newline at end of file
+}
-- 
2.16.6