rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

[entrypoint] Adds one-shot CRIO restart, plus renames source CNI config to .old when not using the watch loop

Browse Source
This commit is contained in:
dougbtv 2019-08-28 13:23:28 -04:00
parent d7b233d0f4
commit 1a2f8ccc9b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
images/entrypoint.sh
View File

@ -30,6 +30,7 @@ MULTUS_LOG_FILE=""
OVERRIDE_NETWORK_NAME=false OVERRIDE_NETWORK_NAME=false
MULTUS_CLEANUP_CONFIG_ON_EXIT=false MULTUS_CLEANUP_CONFIG_ON_EXIT=false
RESTART_CRIO=false RESTART_CRIO=false
CRIO_RESTARTED_ONCE=false
# Give help text for parameters. # Give help text for parameters.
function usage() function usage()
@ -306,10 +307,20 @@ EOF
echo $CONF > $CNI_CONF_DIR/00-multus.conf echo $CONF > $CNI_CONF_DIR/00-multus.conf
log "Config file created @ $CNI_CONF_DIR/00-multus.conf" log "Config file created @ $CNI_CONF_DIR/00-multus.conf"
echo $CONF echo $CONF
# If we're not performing the cleanup on exit, we can safely rename the config file.
if [ "$MULTUS_CLEANUP_CONFIG_ON_EXIT" == false ]; then
mv ${MULTUS_AUTOCONF_DIR}/${MASTER_PLUGIN} ${MULTUS_AUTOCONF_DIR}/${MASTER_PLUGIN}.old
log "Original master file moved to ${MULTUS_AUTOCONF_DIR}/${MASTER_PLUGIN}.old"
fi
if [ "$RESTART_CRIO" == true ]; then if [ "$RESTART_CRIO" == true ]; then
log "Restarting crio" # Restart CRIO only once.
systemctl restart crio if [ "$CRIO_RESTARTED_ONCE" == false ]; then
log "Restarting crio"
systemctl restart crio
CRIO_RESTARTED_ONCE=true
fi
fi fi
fi fi
done done