Skip to content

Commit

Permalink
Package whereabouts IPAM into Antrea docker image (CNF use case).
Browse files Browse the repository at this point in the history
Signed-off-by: arunvelayutham <[email protected]>
  • Loading branch information
arunvelayutham committed May 20, 2021
1 parent 3134f7e commit 41842cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
5 changes: 4 additions & 1 deletion build/images/scripts/install_cni
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 41842cf

Please sign in to comment.