From: tzvika avni <tzvikaa@amdocs.com>
Date: Thu, 7 Sep 2017 13:42:37 +0000 (+0300)
Subject: Provide external helm values
X-Git-Tag: 2.0.0-ONAP~673
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=e3cbfa3e876ae4127241fcc29ca534b6cf44d68c

Provide external helm values

providing the option to add external helm values file to createAll sh
Issue-ID: OOM-267

Change-Id: Id2f4013113cd578c99c5e4a4a4943f9801bb88c1
Signed-off-by: tzvika avni <tzvikaa@amdocs.com>
---

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 636d86fcfd..8a27510e5c 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -8,6 +8,7 @@ usage() {
 Usage: $0 [PARAMs]
 -u                  : Display usage
 -n [NAMESPACE]      : Kubernetes namespace (required)
+-v [VALUES]         : HELM values filepath (usefull when deploying one component at a time)
 -i [INSTANCE]       : ONAP deployment instance # (default: 1)
 -a [APP]            : Specify a specific ONAP component (default: all)
                       from the following choices:
@@ -25,21 +26,25 @@ create_registry_key() {
 }
 
 create_onap_helm() {
-  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3
+  HELM_VALUES_ADDITION=""
+  if [[ ! -z $4 ]]; then
+     HELM_VALUES_ADDITION="--values=$4"  
+  fi
+  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1 --set nodePortPrefix=$3 ${HELM_VALUES_ADDITION}
 }
 
 
 #MAINs
 NS=
+HELM_VALUES_FILEPATH=
 INCL_SVC=true
 APP=
 INSTANCE=1
 MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
-_FILES_PATH=$(echo ../$i/templates)
 
-while getopts ":n:u:s:i:a:du:dp:" PARAM; do
+while getopts ":n:u:s:i:a:du:dp:v:" PARAM; do
   case $PARAM in
     u)
       usage
@@ -48,6 +53,9 @@ while getopts ":n:u:s:i:a:du:dp:" PARAM; do
     n)
       NS=${OPTARG}
       ;;
+    v)
+      HELM_VALUES_FILEPATH=${OPTARG}
+      ;;
     i)
       INSTANCE=${OPTARG}
       ;;
@@ -106,7 +114,7 @@ for i in ${HELM_APPS[@]}; do
   create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
 
   printf "\nCreating deployments and services **********\n"
-  create_onap_helm $NS $i $start
+  create_onap_helm $NS $i $start $HELM_VALUES_FILEPATH
 
   printf "\n"
 done