Provide external helm values

[oom.git] / kubernetes / oneclick / createAll.bash

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 829f27a..8a27510 100755 (executable)
--- 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,26 +26,17 @@ create_registry_key() {
 }
 
 create_onap_helm() {
-  helm install ../$2/ --name $2 --namespace $1 --set nsPrefix=$1
-}
-
-configure_app() {
-  # if previous configuration exists put back original template file
-  for file in $3/*.yaml; do
-    if [ -e "$file-template" ]; then
-      mv "$file-template" "${file%}"
-    fi
-  done
-  
-  if [ -e "$2/Chart.yaml" ]; then
-    sed -i-- 's/nodePort: [0-9]\{2\}[02468]\{1\}/nodePort: '"$4"'/g' $3/all-services.yaml
-    sed -i-- 's/nodePort: [0-9]\{2\}[13579]\{1\}/nodePort: '"$5"'/g' $3/all-services.yaml
+  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
@@ -52,7 +44,7 @@ MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
 
-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
@@ -61,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}
       ;;
@@ -119,9 +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"
-  _FILES_PATH=$(echo ../$i/templates)
-  configure_app $NS $i $_FILES_PATH $start $end
-  create_onap_helm $NS $i
+  create_onap_helm $NS $i $start $HELM_VALUES_FILEPATH
 
   printf "\n"
 done