diff options
| author |   rui hu <hu.rui2@zte.com.cn> | 2017-10-27 09:30:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-27 09:30:28 +0000 |
| commit | 22f243a70070f0f3167cad91bf90c4341845a8f9 (patch) | |
| tree | 2dd1fa065e3bec0f0de4ba0bcd68a6408843f0d7 /kubernetes | |
| parent | bcfe1e3218b2108a8cee9764d00fc4f19aeffcd3 (diff) | |
| parent | 01dc8682f7cf65d74b3484dc57f7be948f3849a6 (diff) | |
Merge "Support token authentication with kubernetes"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/kube2msb/values.yaml | 5 |
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 |