summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-03-22 08:53:13 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-22 08:53:13 +0000
commiteb6e865bdb85a794d848f4e82a24c7d2f335930b (patch)
tree3cba62b1a1b2f34c53f1062015d7d5a9c0185d01
parentb7f023225048446d60b0905c0fe41171d358d5ec (diff)
parent8407a7a0f807af1e255405d22f73df9d36dbd846 (diff)
Merge "remove passing auth token via env var"
-rw-r--r--kubernetes/msb/templates/kube2msb-registrator-deployment.yaml2
-rwxr-xr-xkubernetes/oneclick/createAll.bash8
2 files changed, 1 insertions, 9 deletions
diff --git a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
index f95faf69d0..96ad8708ec 100644
--- 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 488f920e91..ded7c392ed 100755
--- 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
}