From 9463da9d40b54904ecc3d81d7392211b249b8fb3 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Sun, 13 Jun 2021 13:46:22 +0200 Subject: Fix helm-healer.sh script Fix creating namespace during redeployment of helm 3 base ONAP Issue-ID: OOM-2768 Signed-off-by: Krystian Kedron Change-Id: I7cb2d13bc51fbf8f2e0e90ec10eb347d9ea7e32c --- tools/helm-healer.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/helm-healer.sh b/tools/helm-healer.sh index 47479a9b..ab79be8e 100755 --- a/tools/helm-healer.sh +++ b/tools/helm-healer.sh @@ -199,6 +199,18 @@ helm_undeploy() sleep 15s } +helm_deploy() +{ + # Helm v3 need "--create-namespace" to create namespace if don't exist + if [[ $(helm version --template "{{.Version}}") =~ ^v3 ]];then + msg helm deploy ${RELEASE_PREFIX} local/onap --create-namespace --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} + helm deploy ${RELEASE_PREFIX} local/onap --create-namespace --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} + else + msg helm deploy ${RELEASE_PREFIX} local/onap --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} + helm deploy ${RELEASE_PREFIX} local/onap --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} + fi +} + # arg: delete_job() { @@ -691,8 +703,7 @@ fi if [ -z "$HELM_SKIP_DEPLOY" ] ; then # TODO: this is suboptimal - find a way how to deploy only the affected component... msg "Redeploy onap..." - msg helm deploy ${RELEASE_PREFIX} local/onap --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} - helm deploy ${RELEASE_PREFIX} local/onap --namespace ${NAMESPACE} ${OVERRIDES} --timeout ${HELM_TIMEOUT} + helm_deploy else msg "Clean only option used: Skipping redeploy..." fi -- cgit 1.2.3-korg