Skip to content

Commit

Permalink
Upgrade packaged Whereabouts version to v0.5.1 (#3511)
Browse files Browse the repository at this point in the history
Notable chnages:
* bug fixes for race conditions when using K8s CRD backend
* support for CNI version

Now that Whereabouts publishes the binaries as release assets, we can
remove the hack/build-whereabouts.sh script.

Fixes #3473

Signed-off-by: Antonin Bas <abas@vmware.com>
  • Loading branch information
antoninbas committed Mar 23, 2022
1 parent 2c7d486 commit 3c88bc2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 121 deletions.
4 changes: 2 additions & 2 deletions build/images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG OVS_VERSION
FROM ubuntu:20.04 as cni-binaries

ARG CNI_BINARIES_VERSION
ARG WHEREABOUTS_VERSION=v0.4.2
ARG WHEREABOUTS_VERSION=v0.5.1

RUN apt-get update && \
apt-get install -y --no-install-recommends wget ca-certificates
Expand All @@ -21,7 +21,7 @@ RUN set -eux; \
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://downloads.antrea.io/whereabouts/$WHEREABOUTS_VERSION/whereabouts-linux-${pluginsArch}.tgz | tar xz -C /opt/cni/bin/ whereabouts-linux-${pluginsArch}/whereabouts --strip-components=1 --no-same-owner
wget -q -O /opt/cni/bin/whereabouts https://github.com/k8snetworkplumbingwg/whereabouts/releases/download/$WHEREABOUTS_VERSION/whereabouts-${pluginsArch} && chmod +x /opt/cni/bin/whereabouts

FROM antrea/openvswitch:${OVS_VERSION}

Expand Down
4 changes: 2 additions & 2 deletions build/images/base/Dockerfile.ubi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG OVS_VERSION
FROM ubuntu:20.04 as cni-binaries

ARG CNI_BINARIES_VERSION
ARG WHEREABOUTS_VERSION=v0.4.2
ARG WHEREABOUTS_VERSION=v0.5.1

RUN apt-get update && \
apt-get install -y --no-install-recommends wget ca-certificates
Expand All @@ -21,7 +21,7 @@ RUN set -eux; \
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://downloads.antrea.io/whereabouts/$WHEREABOUTS_VERSION/whereabouts-linux-${pluginsArch}.tgz | tar xz -C /opt/cni/bin/ whereabouts-linux-${pluginsArch}/whereabouts --strip-components=1 --no-same-owner
wget -q -O /opt/cni/bin/whereabouts https://github.com/k8snetworkplumbingwg/whereabouts/releases/download/$WHEREABOUTS_VERSION/whereabouts-${pluginsArch} && chmod +x /opt/cni/bin/whereabouts

FROM antrea/openvswitch-ubi:${OVS_VERSION}

Expand Down
117 changes: 0 additions & 117 deletions hack/build-whereabouts.sh

This file was deleted.

0 comments on commit 3c88bc2

Please sign in to comment.