From e75006872b418b9daba3c30000f991ba16ae1328 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Tue, 24 Apr 2018 07:56:27 +0000 Subject: Make all services independent of helm Release.Name Issue-ID: OOM-906 Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66 Signed-off-by: BorislavG --- charts/aai-champ/templates/service.yaml | 6 +++--- charts/aai-champ/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'charts/aai-champ') diff --git a/charts/aai-champ/templates/service.yaml b/charts/aai-champ/templates/service.yaml index 93b0fd1..745c73b 100644 --- a/charts/aai-champ/templates/service.yaml +++ b/charts/aai-champ/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" . }} @@ -28,11 +28,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort}} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .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/charts/aai-champ/values.yaml b/charts/aai-champ/values.yaml index 28f28d4..7849418 100644 --- a/charts/aai-champ/values.yaml +++ b/charts/aai-champ/values.yaml @@ -53,6 +53,7 @@ readiness: service: type: NodePort name: champ + portName: champ internalPort: 9522 nodePort: 78 -- cgit 1.2.3-korg