github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-06-28 16:46:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #753 from s1061123/fix/cni-bin-dir

Browse Source 
Added --cni-bin-dir and --multus-bin-file for regression
This commit is contained in:
Doug Smith 2021-11-08 12:06:12 -05:00 committed by Tomofumi Hayashi
commit ada145ca5f
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
images/entrypoint.sh
View File

@ -12,9 +12,11 @@ trap exitonsigterm SIGTERM
# Set our known directories. # Set our known directories.
CNI_CONF_DIR="/host/etc/cni/net.d" CNI_CONF_DIR="/host/etc/cni/net.d"
CNI_BIN_DIR="/host/opt/cni/bin"
ADDITIONAL_BIN_DIR="" ADDITIONAL_BIN_DIR=""
MULTUS_CONF_FILE="/usr/src/multus-cni/images/70-multus.conf" MULTUS_CONF_FILE="/usr/src/multus-cni/images/70-multus.conf"
MULTUS_AUTOCONF_DIR="/host/etc/cni/net.d" MULTUS_AUTOCONF_DIR="/host/etc/cni/net.d"
MULTUS_BIN_FILE="/usr/src/multus-cni/bin/multus"
MULTUS_KUBECONFIG_FILE_HOST="/etc/cni/net.d/multus.d/multus.kubeconfig" MULTUS_KUBECONFIG_FILE_HOST="/etc/cni/net.d/multus.d/multus.kubeconfig"
MULTUS_TEMP_KUBECONFIG="/tmp/multus.kubeconfig" MULTUS_TEMP_KUBECONFIG="/tmp/multus.kubeconfig"
MULTUS_MASTER_CNI_FILE_NAME="" MULTUS_MASTER_CNI_FILE_NAME=""
@ -44,9 +46,11 @@ function usage()
echo -e "" echo -e ""
echo -e "./entrypoint.sh" echo -e "./entrypoint.sh"
echo -e "\t-h --help" echo -e "\t-h --help"
echo -e "\t--cni-bin-dir=$CNI_BIN_DIR"
echo -e "\t--cni-conf-dir=$CNI_CONF_DIR" echo -e "\t--cni-conf-dir=$CNI_CONF_DIR"
echo -e "\t--cni-version=<cniVersion (e.g. 0.3.1)>" echo -e "\t--cni-version=<cniVersion (e.g. 0.3.1)>"
echo -e "\t--multus-conf-file=$MULTUS_CONF_FILE" echo -e "\t--multus-conf-file=$MULTUS_CONF_FILE"
echo -e "\t--multus-bin-file=$MULTUS_BIN_FILE"
echo -e "\t--skip-multus-binary-copy=$SKIP_BINARY_COPY" echo -e "\t--skip-multus-binary-copy=$SKIP_BINARY_COPY"
echo -e "\t--multus-kubeconfig-file-host=$MULTUS_KUBECONFIG_FILE_HOST" echo -e "\t--multus-kubeconfig-file-host=$MULTUS_KUBECONFIG_FILE_HOST"
echo -e "\t--multus-master-cni-file-name=$MULTUS_MASTER_CNI_FILE_NAME (empty by default, example: 10-calico.conflist)" echo -e "\t--multus-master-cni-file-name=$MULTUS_MASTER_CNI_FILE_NAME (empty by default, example: 10-calico.conflist)"
@ -95,9 +99,15 @@ while [ "$1" != "" ]; do
--cni-version) --cni-version)
CNI_VERSION=$VALUE CNI_VERSION=$VALUE
;; ;;
--cni-bin-dir)
CNI_BIN_DIR=$VALUE
;;
--cni-conf-dir) --cni-conf-dir)
CNI_CONF_DIR=$VALUE CNI_CONF_DIR=$VALUE
;; ;;
--cni-bin-dir)
CNI_BIN_DIR=$VALUE
;;
--multus-conf-file) --multus-conf-file)
MULTUS_CONF_FILE=$VALUE MULTUS_CONF_FILE=$VALUE
;; ;;
@ -155,7 +165,7 @@ done
# Create array of known locations # Create array of known locations
declare -a arr=($CNI_CONF_DIR) declare -a arr=($CNI_CONF_DIR $CNI_BIN_DIR $MULTUS_BIN_FILE)
if [ "$MULTUS_CONF_FILE" != "auto" ]; then if [ "$MULTUS_CONF_FILE" != "auto" ]; then
arr+=($MULTUS_CONF_FILE) arr+=($MULTUS_CONF_FILE)
fi fi
@ -170,6 +180,14 @@ do
fi fi
done done
# Copy files into place and atomically move into final binary name
if [ "$SKIP_BINARY_COPY" = false ]; then
cp -f $MULTUS_BIN_FILE $CNI_BIN_DIR/_multus
mv -f $CNI_BIN_DIR/_multus $CNI_BIN_DIR/multus
else
log "Entrypoint skipped copying Multus binary."
fi
if [ "$MULTUS_CONF_FILE" != "auto" ]; then if [ "$MULTUS_CONF_FILE" != "auto" ]; then
cp -f $MULTUS_CONF_FILE $CNI_CONF_DIR cp -f $MULTUS_CONF_FILE $CNI_CONF_DIR
fi fi