Do not use netns as ID or for entropy
ContainerID is now required so use that or generate random bytes. Fixes #5
This commit is contained in:
@ -1,29 +1,36 @@
|
||||
#!/bin/bash -e
|
||||
#!/bin/bash
|
||||
|
||||
NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
|
||||
|
||||
function exec_plugins() {
|
||||
i=0
|
||||
netns=$2
|
||||
contid=$2
|
||||
netns=$3
|
||||
export CNI_COMMAND=$(echo $1 | tr '[:lower:]' '[:upper:]')
|
||||
export PATH=$CNI_PATH:$PATH
|
||||
export CNI_CONTAINERID=$contid
|
||||
export CNI_NETNS=$netns
|
||||
|
||||
for netconf in $(echo $NETCONFPATH/*.conf | sort); do
|
||||
name=$(jq -r '.name' <$netconf)
|
||||
plugin=$(jq -r '.type' <$netconf)
|
||||
export CNI_IFNAME=$(printf eth%d $i)
|
||||
|
||||
$plugin <$netconf >/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "${name} : error executing $CNI_COMMAND"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
let "i=i+1"
|
||||
done
|
||||
}
|
||||
|
||||
if [ $# -ne 2 ]; then
|
||||
echo "Usage: $0 add|del NETNS-PATH"
|
||||
if [ $# -ne 3 ]; then
|
||||
echo "Usage: $0 add|del CONTAINER-ID NETNS-PATH"
|
||||
echo " Adds or deletes the container specified by NETNS-PATH to the networks"
|
||||
echo " specified in \$NETCONFPATH directory"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exec_plugins $1 $2
|
||||
exec_plugins $1 $2 $3
|
||||
|
Reference in New Issue
Block a user