X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foneclick%2FcreateAll.bash;h=ded7c392ed1866e5c3efd9d1d12c99f48e359a94;hb=fe3f54169ad1a17d27c81a73c18336e9cf94a509;hp=72d852ded61ef38054076037ae27b775ba419db7;hpb=28a345d5c6fadc59c0794afd96a39f4fcca6bbd5;p=oom.git

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 72d852ded6..ded7c392ed 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -27,19 +27,18 @@ check_return_code(){
 }
 
 create_service_account() {
-  cmd=`echo kubectl create clusterrolebinding $1-$2-admin-binding --clusterrole=cluster-admin --serviceaccount=$1-$2:default`
+  cmd=`echo kubectl create clusterrolebinding $1-admin-binding --clusterrole=cluster-admin --serviceaccount=$1:default`
   eval ${cmd}
   check_return_code $cmd
 }
 
 create_namespace() {
-  cmd=`echo kubectl create namespace $1-$2`
+  cmd=`echo kubectl create namespace $1`
   eval ${cmd}
-  check_return_code $cmd
 }
 
 create_registry_key() {
-  cmd=`echo kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7`
+cmd=`echo kubectl --namespace $1 create secret docker-registry $2 --docker-server=$3 --docker-username=$4 --docker-password=$5 --docker-email=$6`
   eval ${cmd}
   check_return_code $cmd
 }
@@ -100,6 +99,8 @@ MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
 
+SINGLE_COMPONENT=false
+
 while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
   case $PARAM in
     u)
@@ -119,6 +120,7 @@ while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
       LOCATION=${OPTARG}
       ;;
     a)
+      SINGLE_COMPONENT=true
       APP=${OPTARG}
       if [[ -z $APP ]]; then
         usage
@@ -162,18 +164,21 @@ printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${sta
 
 printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n"
 
+if [ "$SINGLE_COMPONENT" == "false" ]
+then
+    printf "\nCreating namespace **********\n"
+    create_namespace $NS
 
-printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
+    printf "\nCreating registry secret **********\n"
+    create_registry_key $NS ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
 
-for i in ${HELM_APPS[@]}; do
-  printf "\nCreating namespace **********\n"
-  create_namespace $NS $i
+    printf "\nCreating service account **********\n"
+    create_service_account $NS
+fi
 
-  printf "\nCreating service account **********\n"
-  create_service_account $NS $i
+printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
 
-  printf "\nCreating registry secret **********\n"
-  create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
+for i in ${HELM_APPS[@]}; do
 
   printf "\nCreating deployments and services **********\n"
   create_onap_helm $NS $i $start