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

Change to sleep infinity & read and omit & wait on sleep n (e.g. not infinity)

Browse Source
This commit is contained in:
dougbtv
2021-02-09 15:14:06 -05:00
committed by Tomofumi Hayashi
parent e728da78bc
commit 8bbd3fdcf2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/entrypoint.sh
View File

@@ -257,7 +257,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
log "Attemping to find master plugin configuration, attempt $tries" log "Attemping to find master plugin configuration, attempt $tries"
fi fi
let "tries+=1" let "tries+=1"
sleep 1 & wait; sleep 1;
else else
error "Multus could not be configured: no master plugin was found." error "Multus could not be configured: no master plugin was found."
exit 1; exit 1;
@@ -401,22 +401,22 @@ if [ "$MULTUS_CLEANUP_CONFIG_ON_EXIT" == true ]; then
# Check and see if the original master plugin configuration exists... # Check and see if the original master plugin configuration exists...
if [ ! -f "$MASTER_PLUGIN_LOCATION" ]; then if [ ! -f "$MASTER_PLUGIN_LOCATION" ]; then
log "Master plugin @ $MASTER_PLUGIN_LOCATION has been deleted. Allowing 45 seconds for its restoration..." log "Master plugin @ $MASTER_PLUGIN_LOCATION has been deleted. Allowing 45 seconds for its restoration..."
sleep 10 & wait sleep 10
for i in {1..35} for i in {1..35}
do do
if [ -f "$MASTER_PLUGIN_LOCATION" ]; then if [ -f "$MASTER_PLUGIN_LOCATION" ]; then
log "Master plugin @ $MASTER_PLUGIN_LOCATION was restored. Regenerating given configuration." log "Master plugin @ $MASTER_PLUGIN_LOCATION was restored. Regenerating given configuration."
break break
fi fi
sleep 1 & wait sleep 1
done done
generateMultusConf generateMultusConf
log "Continuing watch loop after configuration regeneration..." log "Continuing watch loop after configuration regeneration..."
fi fi
sleep 1 & wait sleep 1
done done
else else
log "Entering sleep (success)..." log "Entering sleep (success)..."
sleep infinity & wait read
fi fi