diff options
| author |   BorislavG <Borislav.Glozman@amdocs.com> | 2018-04-24 07:56:27 +0000 |
|---|---|---|
| committer | BorislavG <Borislav.Glozman@amdocs.com> | 2018-04-24 13:23:19 +0000 |
| commit | 1ffbd99a2757af8e10d0f6af46177c646364f91b (patch) | |
| tree | ceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/message-router/templates/service.yaml | |
| parent | 23a95a751a002163f61cb7eafb4dc84465415daa (diff) | |
Make all services independent of helm Release.Name
Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/message-router/templates/service.yaml')
| -rw-r--r-- | kubernetes/message-router/templates/service.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/message-router/templates/service.yaml b/kubernetes/message-router/templates/service.yaml index 7265ecb544..45c2616ec9 100644 --- a/kubernetes/message-router/templates/service.yaml +++ b/kubernetes/message-router/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -25,7 +25,7 @@ metadata: annotations: msb.onap.org/service-info: '[ { - "serviceName": "{{ include "common.fullname" . }}", + "serviceName": "{{ include "common.servicename" . }}", "version": "v1", "url": "/", "protocol": "REST", @@ -40,14 +40,14 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }}-{{ .Values.service.externalPort }} + name: {{ .Values.service.portName }}-{{ .Values.service.externalPort }} - port: {{ .Values.service.externalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}-{{ .Values.service.externalPort2 }} + name: {{ .Values.service.portName }}-{{ .Values.service.externalPort2 }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} |