summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank A. Zdarsky <fzdarsky@redhat.com>2018-03-20 11:07:13 +0100
committerFrank A. Zdarsky <fzdarsky@redhat.com>2018-03-20 11:07:13 +0100
commit8407a7a0f807af1e255405d22f73df9d36dbd846 (patch)
tree765356967610db79684a90dbf78dabab24e170cc
parentcdf15aae7665f39e3c478502e584bdc345a657b1 (diff)
remove passing auth token via env var
Issue-ID: OOM-811 Change-Id: I8a0cdc6e727a8045f4b0ac73731c81a676a463b2 Depends-On: I039b6bcc9a301751ba976b77c0f2cc3b904b8e9c Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
-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
}