Make all services independent of helm Release.Name

[oom.git] / kubernetes / vid / templates / deployment.yaml

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 89ed734..929c260 100644 (file)
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -71,19 +71,19 @@ spec:
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
             - name: ASDC_CLIENT_REST_HOST
-              value: sdc-be.{{ include "common.namespace" . }}-sdc
+              value: sdc-be.{{ include "common.namespace" . }}
             - name: ASDC_CLIENT_REST_AUTH
               value: "{{ .Values.config.asdcclientrestauth }}"
             - name: ASDC_CLIENT_REST_PORT
               value: "{{ .Values.config.asdcclientrestport }}"
             - name: VID_AAI_HOST
-              value: aai-service.{{ include "common.namespace" . }}-aai
+              value: aai-service.{{ include "common.namespace" . }}
             - name: VID_AAI_PORT
               value: "{{ .Values.config.vidaaiport }}"
             - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
+              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
             - name: VID_MSO_SERVER_URL
-              value: http://mso.{{ include "common.namespace" . }}-mso:"{{ .Values.config.msoport }}"
+              value: http://mso.{{ include "common.namespace" . }}:"{{ .Values.config.msoport }}"
             - name: VID_MSO_PASS
               value: "{{ .Values.config.vidmsopass }}"
             - name: MSO_DME2_SERVER_URL
@@ -91,13 +91,13 @@ spec:
             - name: MSO_DME2_ENABLED
               value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }}
             - name: VID_ECOMP_REDIRECT_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.h\tm
+              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.htm
             - name: VID_ECOMP_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
+              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
             - name: VID_CONTACT_US_LINK
               value: "{{ .Values.config.vidcontactuslink }}"
             - name: VID_UEB_URL_LIST
-              value: dmaap.{{ include "common.namespace" . }}-message-router
+              value: message-router.{{ include "common.namespace" . }}
             - name: VID_MYSQL_HOST
               value: "{{ .Values.config.vidmysqlhost }}"
             - name: VID_MYSQL_PORT