Merge "sdc K8S-Helm Parameterization"

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

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index bb44100..95dd809 100755 (executable)
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -2,12 +2,12 @@
 
 . $(dirname "$0")/setenv.bash
 
+
 usage() {
   cat <<EOF
 Usage: $0 [PARAMs]
 -u                  : Display usage
 -n [NAMESPACE]      : Kubernetes namespace (required)
--s false            : Exclude services (default: true)
 -i [INSTANCE]       : ONAP deployment instance # (default: 1)
 -a [APP]            : Specify a specific ONAP component (default: all)
                       from the following choices:
@@ -24,20 +24,24 @@ create_registry_key() {
   kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7
 }
 
-create_service() {
-  sed -i -- 's/nodePort: [0-9]\{2\}[02468]\{1\}/nodePort: '"$3"'/g' ../$2/all-services.yaml
-  sed -i -- 's/nodePort: [0-9]\{2\}[13579]\{1\}/nodePort: '"$4"'/g' ../$2/all-services.yaml
-  kubectl --namespace $1-$2 create -f ../$2/all-services.yaml
-  mv ../$2/all-services.yaml-- ../$2/all-services.yaml
+create_onap_helm() {
+  helm install ../$2/ --name $2
 }
 
 configure_app() {
   # if previous configuration exists put back original template file
-  for file in ../$2/*.yaml; do
+  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
+    sed -i "s/onap-/$1-/g" ../$2/values.yaml
+  fi
+
 
   # replace the default 'onap' namespace qualification of K8s hostnames within
   # the config files
@@ -45,11 +49,11 @@ configure_app() {
   #       this is not ideal and should be addressed (along with the replacement
   #       of sed commands for configuration) by the future configuration
   #       user stories (ie. OOM-51 to OOM-53)
-  find ../$2 -type f -exec sed -i -template "s/onap-/$1-/g" {} \;
+  find $3 -type f -exec sed -i -- "s/onap-/$1-/g" {} \;
 
-  # replace the default '/dockerdata/onapdemo' volume mount paths
-  find ../$2 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata\/[a-zA-Z0-9\\-]*\//dockerdata\/'"$1"'\//g' {} \;
-  rm -f ../$2/*.yaml-e
+  # replace the default '/dockerdata-nfs/onapdemo' volume mount paths
+  find $3 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata-nfs\/[a-zA-Z0-9\\-]*\//dockerdata-nfs\/'"$1"'\//g' {} \;
+  rm -f $3/*.yaml-e
 }
 
 
@@ -71,9 +75,6 @@ while getopts ":n:u:s:i:a:du:dp:" PARAM; do
     n)
       NS=${OPTARG}
       ;;
-    s)
-      INCL_SVC=${OPTARG}
-      ;;
     i)
       INSTANCE=${OPTARG}
       ;;
@@ -103,44 +104,41 @@ if [[ -z $NS ]]; then
 fi
 
 if [[ ! -z "$APP" ]]; then
-  ONAP_APPS=($APP)
+  HELM_APPS=($APP)
 fi
 
-if [[ "$INCL_SVC" == true ]]; then
 
-  if [ "$INSTANCE" -gt "$MAX_INSTANCE" ];then
-    printf "\n********** You choose to create ${INSTANCE}th instance of ONAP \n"
-    printf "\n********** Due to port allocation only ${MAX_INSTANCE} instances of ONAP is allowed per kubernetes deployment\n"
-    exit 1
-  fi
+if [ "$INSTANCE" -gt "$MAX_INSTANCE" ];then
+  printf "\n********** You choose to create ${INSTANCE}th instance of ONAP \n"
+  printf "\n********** Due to port allocation only ${MAX_INSTANCE} instances of ONAP is allowed per kubernetes deployment\n"
+  exit 1
+fi
 
-  start=$((300+2*INSTANCE))
-  end=$((start+1))
-  printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${start}00 and ${end}99\n"
+start=$((300+2*INSTANCE))
+end=$((start+1))
+
+printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${start}00 and ${end}99\n"
 
-fi
 
 printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n"
 
-for i in ${ONAP_APPS[@]}; do
+
+printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
+
+for i in ${HELM_APPS[@]}; do
   printf "\nCreating namespace **********\n"
-  create_namespace $NS $i
+  create_namespace $NS $i 
 
   printf "\nCreating registry secret **********\n"
   create_registry_key $NS $i $ONAP_DOCKER_REGISTRY_KEY $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
 
-  if [[ "$INCL_SVC" == true ]]; then
-    printf "\nCreating service **********\n"
-    create_service $NS $i $start $end
-  fi
+  printf "\nCreating deployments and services **********\n"
+  _FILES_PATH=$(echo ../$i/templates)
+  configure_app $NS $i $_FILES_PATH $start $end
+  create_onap_helm $NS $i
 
   printf "\n"
 done
 
-printf "\n\n********** Creating deployments for ${ONAP_APPS[*]} ********** \n"
-for i in ${ONAP_APPS[@]}; do
-  configure_app $NS $i
-  /bin/bash $i.sh $NS $i 'create'
-done
-
 printf "\n**** Done ****\n"
+