github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-15 22:14:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #696 from cgchinmay/fix_entrypoint

Browse Source 
Use MULTUS_MASTER_CNI_FILE_NAME as MASTER_PLUGIN as is, if specified
This commit is contained in:
Doug Smith
2021-07-16 15:25:51 -04:00
committed by GitHub
parent 9b45d4b211 7e44bb6d21
commit a506d7606c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/entrypoint.sh
View File

@@ -268,7 +268,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
tries=0
while [ $found_master == false ]; do
if [ "$MULTUS_MASTER_CNI_FILE_NAME" != "" ]; then
MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR/$MULTUS_MASTER_CNI_FILE_NAME)" || true
MASTER_PLUGIN="$MULTUS_MASTER_CNI_FILE_NAME"
else
MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR | grep -E '\.conf(list)?$' | grep -Ev '00-multus\.conf' | head -1)"
fi
@@ -284,6 +284,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
exit 1;
fi
else
log "Using MASTER_PLUGIN: $MASTER_PLUGIN"
found_master=true