diff options
| author |   rui hu <hu.rui2@zte.com.cn> | 2018-08-14 08:35:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-14 08:35:10 +0000 |
| commit | 6230081505d6eedec5cf45d18ec45f123309af07 (patch) | |
| tree | 4b7838328480769e8dd66c2c2b5d02c9c5b0e032 /kubernetes | |
| parent | 6a8da487ddd0ee76c31ff1a456523a580595636c (diff) | |
| parent | 8f7cc81cea39dd84d1544563d7c1c053bc0ce19d (diff) | |
Merge "Create Service Account for MSB"
Diffstat (limited to 'kubernetes')
6 files changed, 42 insertions, 0 deletions
diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml index c9911eb036..78361a7a71 100644 --- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml +++ b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: + serviceAccountName: msb initContainers: - command: - /root/ready.py diff --git a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml index 09a3d8f470..fb3a90aeae 100644 --- a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: + serviceAccountName: msb containers: - name: {{ include "common.name" . }} image: "{{ .Values.global.dockerHubRepository | default .Values.dockerHubRepository }}/{{ .Values.image }}" diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml index 81006a567d..ad4780966e 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: + serviceAccountName: msb initContainers: - command: - /root/ready.py diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml index ae07b09c25..956ac9ae12 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: + serviceAccountName: msb initContainers: - command: - /root/ready.py diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml index 98ac932601..235fabc9ce 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml @@ -18,6 +18,7 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: + serviceAccountName: msb initContainers: - command: - /root/ready.py diff --git a/kubernetes/msb/templates/serviceaccout.yaml b/kubernetes/msb/templates/serviceaccout.yaml new file mode 100644 index 0000000000..560987bfc1 --- /dev/null +++ b/kubernetes/msb/templates/serviceaccout.yaml @@ -0,0 +1,37 @@ +# Copyright © 2017 Amdocs, Bell Canada, ZTE +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +apiVersion: v1 +kind: ServiceAccount +metadata: + name: msb + namespace: {{ include "common.namespace" . }} +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + name: {{ include "common.namespace" . }}-msb-binding + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: + - kind: ServiceAccount + name: msb + namespace: {{ include "common.namespace" . }} |