diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-10-11 13:54:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-11 13:54:57 +0000 |
| commit | 50f825e6ba947d0de8f5082ab29e43011a523891 (patch) | |
| tree | feca40ebda660b5d36604da4b2010efebe4f5d11 /kubernetes/helm | |
| parent | 6b4fc784f3c7bfce405a430523a4d29932e536d0 (diff) | |
| parent | 9e0a34030ac0f6bb33945b8b041646a5afd886e8 (diff) | |
Merge "Fix deploy on failure of subproject"
Diffstat (limited to 'kubernetes/helm')
| -rwxr-xr-x | kubernetes/helm/plugins/deploy/deploy.sh | 9 |
1 files 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 |