Run all components in one namespace

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

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 7f9cb65..a0569ab 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: vid-server
   name: vid-server
-  namespace: "{{ .Values.nsPrefix }}-vid"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vidServerReplicas }}
   selector:
@@ -35,19 +35,19 @@ spec:
       containers:
       - env:
         - name: ASDC_CLIENT_REST_HOST
-          value: sdc-be.{{ .Values.nsPrefix }}-sdc
+          value: sdc-be.{{ .Values.nsPrefix }}
         - name: ASDC_CLIENT_REST_AUTH
           value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
         - name: ASDC_CLIENT_REST_PORT
           value: "8080"
         - name: VID_AAI_HOST
-          value: aai-service.{{ .Values.nsPrefix }}-aai
+          value: aai-service.{{ .Values.nsPrefix }}
         - name: VID_AAI_PORT
           value: "8443"
         - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/context
         - name: VID_MSO_SERVER_URL
-          value: http://mso.{{ .Values.nsPrefix }}-mso:8080
+          value: http://mso.{{ .Values.nsPrefix }}:8080
         - name: VID_MSO_PASS
           value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
@@ -55,13 +55,13 @@ spec:
         - name: MSO_DME2_ENABLED
           value: "false"
         - name: VID_ECOMP_REDIRECT_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/login.htm
         - name: VID_ECOMP_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/auxapi
         - name: VID_CONTACT_US_LINK
           value: https://todo_contact_us_link.com
         - name: VID_UEB_URL_LIST
-          value: dmaap.{{ .Values.nsPrefix }}-message-router
+          value: dmaap.{{ .Values.nsPrefix }}
         - name: VID_MYSQL_HOST
           value: vid-mariadb
         - name: VID_MYSQL_PORT