From: k.kedron <k.kedron@partner.samsung.com>
Date: Sun, 13 Jun 2021 11:46:22 +0000 (+0200)
Subject: Fix helm-healer.sh script
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9463da9d40b54904ecc3d81d7392211b249b8fb3;p=oom%2Foffline-installer.git

Fix helm-healer.sh script

Fix creating namespace
during redeployment of helm 3 base ONAP

Issue-ID: OOM-2768
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I7cb2d13bc51fbf8f2e0e90ec10eb347d9ea7e32c
---

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: <job name>
 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