Run all components in one namespace

[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 ab12c28..ca38da4 100644 (file)
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-global-kafka
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.kafkaReplicas }}
   selector:
     matchLabels:
       app: global-kafka
@@ -12,7 +13,7 @@ spec:
     metadata:
       labels:
         app: global-kafka
-      name: global-kafka
+      name: message-router-global-kafka
     spec:
       initContainers:
       - command:
@@ -42,7 +43,7 @@ spec:
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}:2181"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "global-kafka"
         - name: KAFKA_BROKER_ID
@@ -59,8 +60,6 @@ spec:
           name: docker-socket
         - mountPath: /kafka
           name: kafka-data
-        - mountPath: /start-kafka.sh
-          name: start-kafka
       restartPolicy: Always
       volumes:
       - name: localtime
@@ -72,9 +71,6 @@ spec:
       - name: kafka-data
         persistentVolumeClaim:
           claimName: message-router-kafka
-      - name: start-kafka
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}