summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-10-10 10:56:22 -0400
committerMike Elliott <mike.elliott@amdocs.com>2019-10-10 10:56:22 -0400
commit9e0a34030ac0f6bb33945b8b041646a5afd886e8 (patch)
tree4772254db0bb032c5175f1dbfafdb1b67d49e456
parentb3209d913c1e43830ecaaf2b89f627fe4e930906 (diff)
Fix deploy on failure of subproject
Issue-ID: OOM-2114 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Change-Id: I8fd18f0e58cc680000a46299c8997e51b1f2dc8e
-rwxr-xr-xkubernetes/helm/plugins/deploy/deploy.sh9
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