From e5e510dabb3bd3c93fb27619d962395ca57c078b Mon Sep 17 00:00:00 2001 From: arunvelayutham Date: Thu, 20 May 2021 03:47:14 +0000 Subject: [PATCH] Package whereabouts IPAM into Antrea docker image. Signed-off-by: arunvelayutham --- build/images/base/Dockerfile | 4 ++-- build/images/scripts/install_cni | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index 9f95f63143f..cdad8673e24 100644 --- a/build/images/base/Dockerfile +++ b/build/images/base/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ *) pluginsArch=''; echo >&2; echo >&2 "unsupported architecture '$dpkgArch'"; echo >&2 ; exit 1 ;; \ esac; \ mkdir -p /opt/cni/bin; \ - wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS - + wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS; \ + wget -q -O /opt/cni/bin/whereabouts https://downloads.antrea.io/whereabouts/v0.4/whereabouts-linux-${pluginsArch} FROM antrea/openvswitch:${OVS_VERSION} diff --git a/build/images/scripts/install_cni b/build/images/scripts/install_cni index be5fd224c12..336e53cb031 100755 --- a/build/images/scripts/install_cni +++ b/build/images/scripts/install_cni @@ -24,9 +24,12 @@ install -m 755 /opt/cni/bin/loopback /host/opt/cni/bin/loopback # Install PortMap CNI binary file. It is required to support hostPort. install -m 755 /opt/cni/bin/portmap /host/opt/cni/bin/portmap -# Install bandwidth CNI binary file, It is required to support traffic shaping. +# Install bandwidth CNI binary file. It is required to support traffic shaping. install -m 755 /opt/cni/bin/bandwidth /host/opt/cni/bin/bandwidth +# Install whereabouts IPAM binary file. Required for global IPAM support specific to CNF use cases. +install -m 755 /opt/cni/bin/whereabouts /host/opt/cni/bin/whereabouts + # Load the OVS kernel module modprobe openvswitch || (echo "Failed to load the OVS kernel module from the container, try running 'modprobe openvswitch' on your Nodes"; exit 1)