diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-04-24 20:15:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-24 20:15:37 +0000 |
| commit | 9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch) | |
| tree | 4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/uui/charts | |
| parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
| parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) | |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/uui/charts')
| -rw-r--r-- | kubernetes/uui/charts/uui-server/templates/service.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/uui/charts/uui-server/values.yaml | 3 |
2 files changed, 5 insertions, 4 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 |