github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-13 15:34:08 +00:00
Code Issues Projects Releases Wiki Activity

Use MULTUS_MASTER_CNI_FILE_NAME as MASTER_PLUGIN as is, if specified

Browse Source
This commit is contained in:
Chinmay Gadgil 2021-07-12 10:30:20 -07:00
parent 9b45d4b211
commit 7e44bb6d21
1 changed files with 2 additions and 1 deletions
Show Stats 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 tries=0
while [ $found_master == false ]; do while [ $found_master == false ]; do
if [ "$MULTUS_MASTER_CNI_FILE_NAME" != "" ]; then 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 else
MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR | grep -E '\.conf(list)?$' | grep -Ev '00-multus\.conf' | head -1)" MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR | grep -E '\.conf(list)?$' | grep -Ev '00-multus\.conf' | head -1)"
fi fi
@ -284,6 +284,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
exit 1; exit 1;
fi fi
else else
log "Using MASTER_PLUGIN: $MASTER_PLUGIN"
found_master=true found_master=true