aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuabingZhao <zhao.huabing@zte.com.cn>2017-10-27 03:25:34 +0000
committerHuabingZhao <zhao.huabing@zte.com.cn>2017-10-27 03:37:38 +0000
commit01dc8682f7cf65d74b3484dc57f7be948f3849a6 (patch)
treec7f99469f22d055d4321596621c7c5986422c0c5
parent4feb718f259bf41ea72dbf44008182c6c1b823fc (diff)
Support token authentication with kubernetes
Change-Id: Ie404f1019ab7b89ae0a6196d7563e9090ad4a1b2 Issue-Id: OOM-379 Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
-rw-r--r--kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml4
-rw-r--r--kubernetes/kube2msb/values.yaml5
2 files changed, 6 insertions, 3 deletions
diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
index 502c1fa50f..92c56c68cc 100644
--- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
+++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
@@ -22,8 +22,10 @@ spec:
env:
- name: KUBE_MASTER_URL
value: {{ .Values.kubeMasterUrl }}
+ - name: AUTH_TOKEN
+ value: {{ .Values.kubeMasterAuthToken }}
- name: MSB_URL
value: {{ .Values.discoveryUrl }}
imagePullPolicy: {{ .Values.pullPolicy }}
imagePullSecrets:
- - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/kube2msb/values.yaml b/kubernetes/kube2msb/values.yaml
index 3864f4d335..8cb7113994 100644
--- a/kubernetes/kube2msb/values.yaml
+++ b/kubernetes/kube2msb/values.yaml
@@ -2,5 +2,6 @@ nsPrefix: onap
pullPolicy: IfNotPresent
image:
kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb
-kubeMasterUrl: http://10.96.33.43:8080/r/projects/1a7/kubernetes:6443
-discoveryUrl: http://msb-discovery.onap-msb:10081 \ No newline at end of file
+kubeMasterUrl: https://10.42.56.154:6443
+discoveryUrl: http://msb-discovery.onap-msb:10081
+kubeMasterAuthToken: QmFzaWMgTURrd056VXdSVEk1TVRGRk9UaEVOREJCTWprNlpHTnlaSGt4YzJsSVlsRlVZVU16WTFsUk1XWnZhV0UyY21GRWEwNUhkMDFDVWxORVRIUmlZUT09