commit e71891de4c8caacb69efcfef622b94f52790c99c
author Bartek Grzybowski <b.grzybowski@partner.samsung.com> Mon Jun 14 09:31:16 2021 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon Jun 14 09:31:16 2021 +0000
tree 19f8f776d5ce88423a0bc427e2b85a783003a230
parent 9463da9d40b54904ecc3d81d7392211b249b8fb3
parent c3c0658e105894184c61a3790c3d9d59c9d9f584

Merge "[MOLECULE] Pin ansible-base and Jinja pip packages versions"

tools/helm-healer.sh

diff --git a/tools/helm-healer.sh b/tools/helm-healer.sh
index 47479a9..ab79be8 100755
--- a/tools/helm-healer.sh
+++ b/tools/helm-healer.sh
@@ -199,6 +199,18 @@
     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 @@
 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