From 0b76e728d2ef87fc2d85d644c8ca45cdc3f93645 Mon Sep 17 00:00:00 2001 From: Mike Elliott Date: Thu, 10 Oct 2019 10:56:22 -0400 Subject: Fix deploy on failure of subproject Issue-ID: OOM-2114 Signed-off-by: Mike Elliott Change-Id: I8fd18f0e58cc680000a46299c8997e51b1f2dc8e --- kubernetes/helm/plugins/deploy/deploy.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh index 1622689386..3da189b908 100755 --- a/kubernetes/helm/plugins/deploy/deploy.sh +++ b/kubernetes/helm/plugins/deploy/deploy.sh @@ -140,13 +140,12 @@ deploy() { # actual upgrade/install of parent and subcharts. DEPLOY_FLAGS=$(resolve_deploy_flags "$FLAGS") - # determine if upgrading individual subchart or entire parent + subcharts + # determine if upgrading individual subchart or entire parent + subcharts SUBCHART_RELEASE="$(cut -d'-' -f2 <<<"$RELEASE")" - if [[ ! -d "$CACHE_SUBCHART_DIR/$SUBCHART_RELEASE" ]]; then + # update specified subchart without parent + RELEASE="$(cut -d'-' -f1 <<<"$RELEASE")" + if [[ $SUBCHART_RELEASE == $RELEASE ]]; then SUBCHART_RELEASE= - else - # update specified subchart without parent - RELEASE="$(cut -d'-' -f1 <<<"$RELEASE")" fi # clear previously cached charts -- cgit 1.2.3-korg