commit e75006872b418b9daba3c30000f991ba16ae1328
author BorislavG <Borislav.Glozman@amdocs.com> Tue Apr 24 07:56:27 2018 +0000
committer BorislavG <Borislav.Glozman@amdocs.com> Tue Apr 24 13:23:19 2018 +0000
tree 4fb253a08a22bd1600a908fd9416c895f449f5d2
parent 7990d1b55d311e47b891919a65f729ae1fcf83b2

Make all services independent of helm Release.Name

Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

charts/aai-elasticsearch/templates/service.yaml

diff --git a/charts/aai-elasticsearch/templates/service.yaml b/charts/aai-elasticsearch/templates/service.yaml
index 84548ed..54ee8b6 100644
--- a/charts/aai-elasticsearch/templates/service.yaml
+++ b/charts/aai-elasticsearch/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.name" . }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -14,10 +14,10 @@
     {{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.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.fullname" . }}

charts/aai-elasticsearch/values.yaml

diff --git a/charts/aai-elasticsearch/values.yaml b/charts/aai-elasticsearch/values.yaml
index af7fd3d..e11326a 100644
--- a/charts/aai-elasticsearch/values.yaml
+++ b/charts/aai-elasticsearch/values.yaml
@@ -37,6 +37,7 @@
 service:
   type: ClusterIP
   name: aai-elasticsearch
+  portName: aai-elasticsearch
   internalPort: 9200
 
 ingress: