From 1ffbd99a2757af8e10d0f6af46177c646364f91b 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 --- kubernetes/vid/templates/deployment.yaml | 4 ++-- kubernetes/vid/templates/service.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kubernetes/vid/templates') diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index 847e636fa8..929c260815 100644 --- a/kubernetes/vid/templates/deployment.yaml +++ b/kubernetes/vid/templates/deployment.yaml @@ -97,9 +97,9 @@ spec: - 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 diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml index 3969d2184b..3d1097f7ff 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 @@ 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" . }} -- cgit 1.2.3-korg