Containers time zone sync

[oom.git] / kubernetes / message-router / templates / message-router-kafka.yaml

diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index cb2f3e9..1564f9b 100644 (file)
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: global-kafka
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-message-router"
 spec:
   selector:
     matchLabels:
@@ -52,7 +52,7 @@ spec:
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.onap-message-router:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "global-kafka"
         - name: KAFKA_BROKER_ID
@@ -62,6 +62,9 @@ spec:
         - name: KAFKA_PORT
           value: "9092"
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /var/run/docker.sock
           name: docker-socket
         - mountPath: /kafka
@@ -70,14 +73,17 @@ spec:
           name: start-kafka
       restartPolicy: Always
       volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       - name: docker-socket
         hostPath:
           path: /var/run/docker.sock
       - name: kafka-data
-        hostPath:
-          path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+        persistentVolumeClaim:
+          claimName: message-router-kafka
       - name: start-kafka
         hostPath:
-          path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"