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/uui | |
| 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/uui')
| -rw-r--r-- | kubernetes/uui/charts/uui-server/templates/service.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/uui/charts/uui-server/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/uui/templates/service.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/uui/values.yaml | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/kubernetes/uui/charts/uui-server/templates/service.yaml b/kubernetes/uui/charts/uui-server/templates/service.yaml index 4570c99473..7d0d03f23f 100644 --- a/kubernetes/uui/charts/uui-server/templates/service.yaml +++ b/kubernetes/uui/charts/uui-server/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -40,11 +40,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.uuiPortPrefix | default .Values.uuiPortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/uui/charts/uui-server/values.yaml b/kubernetes/uui/charts/uui-server/values.yaml index 0e4049d21c..19e1a9ca20 100644 --- a/kubernetes/uui/charts/uui-server/values.yaml +++ b/kubernetes/uui/charts/uui-server/values.yaml @@ -56,7 +56,8 @@ readiness: service: type: NodePort - name: uui + name: uui-server + portName: uui-server internalPort: 8082 nodePort: 99 diff --git a/kubernetes/uui/templates/service.yaml b/kubernetes/uui/templates/service.yaml index 9e94784676..6baad45613 100644 --- a/kubernetes/uui/templates/service.yaml +++ b/kubernetes/uui/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -40,11 +40,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.uuiPortPrefix | default .Values.uuiPortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml index c61e203f2d..9d767118ab 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -57,6 +57,7 @@ readiness: service: type: NodePort name: uui + portName: uui internalPort: 8080 nodePort: 98 |