From dd6f75f73c7d1d78a342ce473a8df7b65ae6eed9 Mon Sep 17 00:00:00 2001 From: Mike Elliott Date: Wed, 24 Oct 2018 12:29:00 -0400 Subject: Fix deployment of sniro and sdnc There was a bug that prevented charts from being deployed when sniro-emulator was disabled. The '-' caused parsing issues which is now resolved. Change-Id: I0e35d3ef5f07dfd2d6dc2f2d60a1614dcf53a73c Issue-ID: OOM-1478 Signed-off-by: Mike Elliott --- kubernetes/helm/plugins/deploy/deploy.sh | 65 +++++++++++--------------------- 1 file changed, 23 insertions(+), 42 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh index 9d9d1d208c..938c651a97 100755 --- a/kubernetes/helm/plugins/deploy/deploy.sh +++ b/kubernetes/helm/plugins/deploy/deploy.sh @@ -42,22 +42,6 @@ Flags: EOF } -parse_yaml() { - local prefix=$2 - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034') - sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ - -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 | - awk -F$fs '{ - indent = length($1)/2; - vname[indent] = $2; - for (i in vname) {if (i > indent) {delete vname[i]}} - if (length($3) > 0) { - vn=""; for (i=0; i $LOG_FILE - SUBCHART_OVERRIDES=$CACHE_SUBCHART_DIR/$subchart/subchart-overrides.yaml helm upgrade -i "${RELEASE}-${subchart}" $CACHE_SUBCHART_DIR/$subchart \ $DEPLOY_FLAGS -f $GLOBAL_OVERRIDES -f $SUBCHART_OVERRIDES \ > $LOG_FILE 2>&1 @@ -221,7 +202,7 @@ deploy() { if [[ $VERBOSE == "true" ]]; then cat $LOG_FILE else - echo "release ${RELEASE}-${subchart} deployed" + echo "release \"${RELEASE}-${subchart}\" deployed" fi fi else -- cgit 1.2.3-korg