From: Le Yao <le.yao@intel.com>
Date: Fri, 27 Nov 2020 05:54:11 +0000 (+0000)
Subject: Fix helm issue from v2 to v3
X-Git-Tag: v1.0~8
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=1d991f1cf02d29f888a9d5d337fb909ce2dfbb2b;p=icn%2Fsdwan.git

Fix helm issue from v2 to v3

Update the scripts to use helm v3

Signed-off-by: Le Yao <le.yao@intel.com>
Change-Id: I79496e1a92e00a9ce60ceac789e81f007dd208c0
---

diff --git a/platform/test/e2e-test-crd/edge-scripts/setup-cnf.sh b/platform/test/e2e-test-crd/edge-scripts/setup-cnf.sh
index 9a4139d..a901cd1 100755
--- a/platform/test/e2e-test-crd/edge-scripts/setup-cnf.sh
+++ b/platform/test/e2e-test-crd/edge-scripts/setup-cnf.sh
@@ -110,9 +110,8 @@ sudo apt-get install helm
 
 envsubst < ./cnf/values.yaml >> ./cnf/value.yaml
 mv ./cnf/value.yaml ./cnf/values.yaml
-helm init
 helm package ./cnf
-helm install ./cnf-0.1.0.tgz
+helm install ./cnf-0.1.0.tgz --generate-name
 sleep 20
 
 sdwan_status=$(kubectl get po | grep $sdewan_cnf_name | awk '{print $3}' | head -1)
@@ -192,7 +191,7 @@ fi
 
 echo "--------------------- Setup sdewan controller with helm ---------------------"
 helm package ./controllers
-helm install controllers-0.1.0.tgz
+helm install controllers-0.1.0.tgz --generate-name
 sleep 1m
 
 echo "--------------------- Applying IPSec CRDs ---------------------"
diff --git a/platform/test/e2e-test-crd/sdewan-hub/scripts/setup-cnf.sh b/platform/test/e2e-test-crd/sdewan-hub/scripts/setup-cnf.sh
index e8d9b38..ea59125 100755
--- a/platform/test/e2e-test-crd/sdewan-hub/scripts/setup-cnf.sh
+++ b/platform/test/e2e-test-crd/sdewan-hub/scripts/setup-cnf.sh
@@ -85,9 +85,8 @@ sudo apt-get update
 sudo apt-get install helm
 
 envsubst < ./cnf/values.yaml >> ./cnf/values.yaml
-helm init
 helm package ./cnf
-helm install ./cnf-0.1.0.tgz
+helm install ./cnf-0.1.0.tgz --generate-name
 
 sleep 20
 
@@ -107,7 +106,7 @@ fi
 
 echo "--------------------- Setup sdewan controller ---------------------"
 helm package ./controllers
-helm install ./controllers-0.1.0.tgz
+helm install ./controllers-0.1.0.tgz --generate-name
 sleep 1m
 
 echo "--------------------- Applying CRDs ---------------------"