commit 2fcd391f36ba041a675a4e3012067eb673294857
author Alok Bhatt <alok_bh@hcl.com> Fri Dec 04 10:40:36 2020 +0000
committer Alok Bhatt <alok_bh@hcl.com> Thu Dec 10 07:39:33 2020 +0000
tree ae0202d99c5cda747144cad78404fc28b6e49f78
parent a72e0f1c2ae78ab9eadacf5e7b3df53998584a72

Enabling helm3 & kubernetes 1.18 for RIC

. Resolving a helm related error message in Jenkins build log
. Keeping helm2 and k8 1.16 as default while allowing the teams to still use helm3 & k1.18

Issue-Id: RIC-678

Signed-off-by: Alok Bhatt <alok_bh@hcl.com>
Change-Id: I77c5482352c038ce20f13ccfb785ba75c1434046

bin/prepare-common-templates

diff --git a/bin/prepare-common-templates b/bin/prepare-common-templates
index 255c32d..bfdd3d2 100755
--- a/bin/prepare-common-templates
+++ b/bin/prepare-common-templates
@@ -20,7 +20,7 @@
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 #Check for helm3
-IS_HELM3=$(helm version --short|grep -e "^v3")
+IS_HELM3=$(helm version -c --short|grep -e "^v3")
 
 # Start Helm local repo if there isn't one
 HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')