Merge "Fixed incorrect APP url to access CLI"

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

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index c23f014..0240c83 100755 (executable)
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -13,7 +13,7 @@ Usage: $0 [PARAMs]
 -i [INSTANCE]       : ONAP deployment instance # (default: 1)
 -a [APP]            : Specify a specific ONAP component (default: all)
                       from the following choices:
-                      sdc, aai ,mso, message-router, robot, vid, aaf
+                      sdc, aai ,mso, message-router, robot, vid, aaf, uui
                       sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
 EOF
 }
@@ -84,7 +84,13 @@ create_onap_helm() {
     fi
   fi
 
-  cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}`
+  # assign default auth token
+  if [[ -z $ONAP_DEFAULT_AUTH_TOKEN ]]; then
+    DEFAULT_SECRET=`kubectl get secrets -n kube-system | grep default-token |  awk '{ print $1}'`
+    ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n kube-system -o yaml | grep  'token:'  | awk '{ print $2}' | base64 --decode`
+  fi
+
+  cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3,kubeMasterAuthToken=$ONAP_DEFAULT_AUTH_TOKEN ${HELM_VALUES_ADDITION}`
   eval ${cmd}
   check_return_code $cmd
 }