diff --git a/images/entrypoint.sh b/images/entrypoint.sh index 8457c087e..0de44c717 100755 --- a/images/entrypoint.sh +++ b/images/entrypoint.sh @@ -10,6 +10,8 @@ MULTUS_CONF_FILE="/usr/src/multus-cni/images/70-multus.conf" MULTUS_BIN_FILE="/usr/src/multus-cni/bin/multus" MULTUS_KUBECONFIG_FILE_HOST="/etc/cni/net.d/multus.d/multus.kubeconfig" MULTUS_NAMESPACE_ISOLATION=false +MULTUS_LOG_LEVEL="" +MULTUS_LOG_FILE="" # Give help text for parameters. function usage() @@ -17,7 +19,7 @@ function usage() echo -e "This is an entrypoint script for Multus CNI to overlay its binary and " echo -e "configuration into locations in a filesystem. The configuration & binary file " echo -e "will be copied to the corresponding configuration directory. When " - echo -e "`--multus-conf-file=auto` is used, 00-multus.conf will be automatically " + echo -e "'--multus-conf-file=auto' is used, 00-multus.conf will be automatically " echo -e "generated from the CNI configuration file of the master plugin (the first file " echo -e "in lexicographical order in cni-conf-dir)." echo -e "" @@ -29,6 +31,8 @@ function usage() echo -e "\t--multus-bin-file=$MULTUS_BIN_FILE" echo -e "\t--multus-kubeconfig-file-host=$MULTUS_KUBECONFIG_FILE_HOST" echo -e "\t--namespace-isolation=$MULTUS_NAMESPACE_ISOLATION" + echo -e "\t--multus-log-level=$MULTUS_LOG_LEVEL (empty by default, used only with --multus-conf-file=auto)" + echo -e "\t--multus-log-file=$MULTUS_LOG_FILE (empty by default, used only with --multus-conf-file=auto)" } # Parse parameters given as arguments to this script. @@ -58,10 +62,14 @@ while [ "$1" != "" ]; do --namespace-isolation) MULTUS_NAMESPACE_ISOLATION=$VALUE ;; + --multus-log-level) + MULTUS_LOG_LEVEL=$VALUE + ;; + --multus-log-file) + MULTUS_LOG_FILE=$VALUE + ;; *) - echo "ERROR: unknown parameter \"$PARAM\"" - usage - exit 1 + echo "WARNING: unknown parameter \"$PARAM\"" ;; esac shift @@ -173,19 +181,53 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then exit 1; fi else + found_master=true + + ISOLATION_STRING="" + if [ "$MULTUS_NAMESPACE_ISOLATION" == true ]; then + ISOLATION_STRING="\"namespaceIsolation\": true," + fi + + LOG_LEVEL_STRING="" + if [ ! -z "${MULTUS_LOG_LEVEL// }" ]; then + case "$MULTUS_LOG_LEVEL" in + debug) + ;; + error) + ;; + panic) + ;; + verbose) + ;; + *) + echo "ERROR: Log levels should be one of: debug/verbose/error/panic, did not understand $MULTUS_LOG_LEVEL" + usage + exit 1 + esac + LOG_LEVEL_STRING="\"logLevel\": \"$MULTUS_LOG_LEVEL\"," + fi + + LOG_FILE_STRING="" + if [ ! -z "${MULTUS_LOG_FILE// }" ]; then + LOG_FILE_STRING="\"logFile\": \"$MULTUS_LOG_FILE\"," + fi + MASTER_PLUGIN_JSON="$(cat $CNI_CONF_DIR/$MASTER_PLUGIN)" CONF=$(cat <<-EOF -{ - "name": "multus-cni-network", - "type": "multus", - "kubeconfig": "$MULTUS_KUBECONFIG_FILE_HOST", - "delegates": [ - $MASTER_PLUGIN_JSON - ] -} + { + "name": "multus-cni-network", + "type": "multus", + $ISOLATION_STRING + $LOG_LEVEL_STRING + $LOG_FILE_STRING + "kubeconfig": "$MULTUS_KUBECONFIG_FILE_HOST", + "delegates": [ + $MASTER_PLUGIN_JSON + ] + } EOF - ) + ) echo $CONF > $CNI_CONF_DIR/00-multus.conf echo "Config file created @ $CNI_CONF_DIR/00-multus.conf" fi