Revert "added filebeat to all components"

[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 58ce80b..69c0b57 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: vid-server
   name: vid-server
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-vid"
 spec:
   selector:
     matchLabels:
@@ -44,19 +44,19 @@ spec:
       containers:
       - env:
         - name: ASDC_CLIENT_REST_HOST
-          value: sdc-be.onap-sdc
+          value: sdc-be.{{ .Values.nsPrefix }}-sdc
         - name: ASDC_CLIENT_REST_AUTH
           value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
         - name: ASDC_CLIENT_REST_PORT
           value: "8080"
         - name: VID_AAI_HOST
-          value: aai-service.onap-aai
+          value: aai-service.{{ .Values.nsPrefix }}-aai
         - name: VID_AAI_PORT
           value: "8443"
         - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-          value: http://portalapps.onap-portal:8989/ECOMPPORTAL/context
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/context
         - name: VID_MSO_SERVER_URL
-          value: http://mso.onap-mso:8080
+          value: http://mso.{{ .Values.nsPrefix }}-mso:8080
         - name: VID_MSO_PASS
           value: 51515201a8d4c5c08d533db9bd1e1a9b
         - name: MSO_DME2_SERVER_URL
@@ -64,13 +64,13 @@ spec:
         - name: MSO_DME2_ENABLED
           value: "false"
         - name: VID_ECOMP_REDIRECT_URL
-          value: http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/login.htm
         - name: VID_ECOMP_REST_URL
-          value: http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/auxapi
         - name: VID_CONTACT_US_LINK
           value: https://todo_contact_us_link.com
         - name: VID_UEB_URL_LIST
-          value: dmaap.onap-message-router
+          value: dmaap.{{ .Values.nsPrefix }}-message-router
         - name: VID_MYSQL_HOST
           value: vid-mariadb
         - name: VID_MYSQL_PORT
@@ -88,10 +88,18 @@ spec:
         name: vid-server
         ports:
         - containerPort: 8080
+        volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         readinessProbe:
           tcpSocket:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
+      volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"