From 5d3dc52096aa51c5f16f17778ebdd7f0e91d4b19 Mon Sep 17 00:00:00 2001 From: N Date: Tue, 8 Jun 2021 18:40:57 +0200 Subject: [PATCH] fix: Asm overlay path (#921) * use absolute path for overlay files similar to service account key file * fix for multiple files * fix for multiple files * fix for multiple files * fix for multiple files * fix for multiple files * fix for none Co-authored-by: Bharath KKB --- modules/asm/scripts/install_asm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/asm/scripts/install_asm.sh b/modules/asm/scripts/install_asm.sh index b65cbafed..eb8470009 100755 --- a/modules/asm/scripts/install_asm.sh +++ b/modules/asm/scripts/install_asm.sh @@ -79,7 +79,11 @@ item="${OPTIONS[*]}";OPTIONS_COMMAND=$(echo "--option" "${item// / --option }") echo -e "OPTIONS_COMMAND is $OPTIONS_COMMAND" echo -e "CUSTOM_OVERLAYS array length is ${#CUSTOM_OVERLAYS[@]}" # Create custom_overlays command snippet -item="${CUSTOM_OVERLAYS[*]}";CUSTOM_OVERLAYS_COMMAND=$(echo "--custom_overlay" "${item// / --custom_overlay }") +if [[ "${CUSTOM_OVERLAYS[*]}" == "none" ]]; then + CUSTOM_OVERLAYS_COMMAND="--custom_overlay none" +else + item="${CUSTOM_OVERLAYS[*]}";CUSTOM_OVERLAYS_COMMAND=$(echo "--custom_overlay" "$(pwd)/${item// / --custom_overlay $(pwd)/}") +fi echo -e "CUSTOM_OVERLAYS_COMMAND is $CUSTOM_OVERLAYS_COMMAND" echo -e "ENABLE_ALL is $ENABLE_ALL" echo -e "ENABLE_CLUSTER_ROLES is $ENABLE_CLUSTER_ROLES"