Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump up portmap version to v0.8.7 #1534

Merged
merged 1 commit into from
Nov 11, 2020
Merged

Bump up portmap version to v0.8.7 #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update && \
ENV CNI_PLUGINS="./host-local ./loopback ./portmap ./bandwidth"

RUN mkdir -p /opt/cni/bin && \
wget -q -O - https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS
wget -q -O - https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS


FROM antrea/openvswitch:${OVS_VERSION}
Expand Down
27 changes: 11 additions & 16 deletions build/images/scripts/install_cni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,17 @@ install -m 755 /usr/local/bin/antrea-cni /host/opt/cni/bin/antrea
# Hence, delete older 10-antrea.conf file.
rm -f /host/etc/cni/net.d/10-antrea.conf

# Install the loopback plugin if not already present
# It is required by kubelet on Linux when using docker as the container runtime

if [ ! -f /host/opt/cni/bin/loopback ]; then
install -m 755 /opt/cni/bin/loopback /host/opt/cni/bin/loopback
fi

# Install PortMap CNI binary file
if [ ! -f /host/opt/cni/bin/portmap ]; then
install -m 755 /opt/cni/bin/portmap /host/opt/cni/bin/portmap
fi

# Install bandwidth CNI binary file
if [ ! -f /host/opt/cni/bin/bandwidth ]; then
install -m 755 /opt/cni/bin/bandwidth /host/opt/cni/bin/bandwidth
fi
# Install the loopback plugin.
# It is required by kubelet on Linux when using docker as the container runtime.
# We replace the binary files even they are already present on the Node to make
# sure expected versions are used.
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 -m 755 /opt/cni/bin/bandwidth /host/opt/cni/bin/bandwidth

# Load the OVS kernel module
modprobe openvswitch
23 changes: 9 additions & 14 deletions build/images/scripts/install_cni_kind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,14 @@ install -m 644 /etc/antrea/antrea-cni.conflist /host/etc/cni/net.d/10-antrea.con
# Install Antrea binary file
install -m 755 /usr/local/bin/antrea-cni /host/opt/cni/bin/antrea

# Install the loopback plugin if not already present
# It is required by kubelet on Linux when using docker as the container runtime
# Install the loopback plugin.
# It is required by kubelet on Linux when using docker as the container runtime.
# We replace the binary files even they are already present on the Node to make
# sure expected versions are used.
install -m 755 /opt/cni/bin/loopback /host/opt/cni/bin/loopback

if [ ! -f /host/opt/cni/bin/loopback ]; then
install -m 755 /opt/cni/bin/loopback /host/opt/cni/bin/loopback
fi
# Install PortMap CNI binary file. It is required to support hostPort.
install -m 755 /opt/cni/bin/portmap /host/opt/cni/bin/portmap

# Install PortMap CNI binary file
if [ ! -f /host/opt/cni/bin/portmap ]; then
install -m 755 /opt/cni/bin/portmap /host/opt/cni/bin/portmap
fi

# Install bandwidth CNI binary file
if [ ! -f /host/opt/cni/bin/bandwidth ]; then
install -m 755 /opt/cni/bin/bandwidth /host/opt/cni/bin/bandwidth
fi
# Install bandwidth CNI binary file, It is required to support traffic shaping.
install -m 755 /opt/cni/bin/bandwidth /host/opt/cni/bin/bandwidth