%define COMPONENT danm
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 4.0.0
%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}
%define go_version 1.12.1
%define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%build
mkdir -p %{binary_build_dir}/cni
%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 \
# Build DANM binaries
docker build \
%define COMPONENT hyperdanm
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 4.0.0
%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
%define go_version 1.12.1
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define danm_components netwatcher svcwatcher webhook
{
"name": "meta_cni",
"type": "danm",
{
"name": "meta_cni",
"type": "danm",
"kubeconfig": "/etc/kubernetes/kubeconfig/danmc.yml",
"cniDir": "/etc/cni/net.d"
}
"kubeconfig": "/etc/kubernetes/kubeconfig/danmc.yml",
"cniDir": "/etc/cni/net.d"
}
{
"name": "cbr0",
"type": "flannel",
{
"name": "cbr0",
"type": "flannel",
"delegate": {
"hairpinMode": true,
"isDefaultGateway": true
}
"delegate": {
"hairpinMode": true,
"isDefaultGateway": true
}
-}
\ No newline at end of file