Merge "remove passing auth token via env var"

diff --git a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
index f95faf6..96ad870 100644 (file)
--- a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
+++ b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
@@ -38,8 +38,6 @@ spec:
         env:
         - name: KUBE_MASTER_URL
           value: {{ .Values.kubeMasterUrl }}
-        - name: AUTH_TOKEN
-          value: {{ .Values.kubeMasterAuthToken }}
         - name: MSB_URL
           value: {{tpl $.Values.discoveryUrl .}}
         imagePullPolicy: {{ .Values.pullPolicy }}

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 488f920..ded7c39 100755 (executable)
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -83,13 +83,7 @@ create_onap_helm() {
     fi
   fi
 
-  # assign default auth token
-  if [[ -z $ONAP_DEFAULT_AUTH_TOKEN ]]; then
-    DEFAULT_SECRET=`kubectl get secrets -n $1 | grep default-token |  awk '{ print $1}'`
-    ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n $1 -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}`
+  cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}`
   eval ${cmd}
   check_return_code $cmd
 }