commit 1ffbd99a2757af8e10d0f6af46177c646364f91b
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 ceb97b36e0e6ae50349f6495dc585b4ebd61d3f6
parent 23a95a751a002163f61cb7eafb4dc84465415daa

Make all services independent of helm Release.Name

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

kubernetes/vid/templates/deployment.yaml

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 847e636..929c260 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -97,9 +97,9 @@
             - name: VID_CONTACT_US_LINK
               value: "{{ .Values.config.vidcontactuslink }}"
             - name: VID_UEB_URL_LIST
-              value: dmaap.{{ include "common.namespace" . }}
+              value: message-router.{{ include "common.namespace" . }}
             - name: VID_MYSQL_HOST
-              value: "{{ .Release.Name }}-{{ .Values.config.vidmysqlhost }}"
+              value: "{{ .Values.config.vidmysqlhost }}"
             - name: VID_MYSQL_PORT
               value: "{{ .Values.config.vidmysqlport }}"
             - name: VID_MYSQL_DBNAME

kubernetes/vid/templates/service.yaml

diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml
index 3969d21..3d1097f 100644
--- a/kubernetes/vid/templates/service.yaml
+++ b/kubernetes/vid/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 @@
     {{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" . }}