Merge message-router chart under dmaap

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

diff --git a/kubernetes/message-router/charts/kafka/templates/deployment.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
similarity index 96%
rename from kubernetes/message-router/charts/kafka/templates/deployment.yaml
rename to kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
index a4e13cd..25ab210 100644 (file)
--- a/kubernetes/message-router/charts/kafka/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - {{ .Values.zookeeper.nameOverride }}
+        - {{ .Values.zookeeper.name }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -78,7 +78,7 @@ spec:
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "{{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperPort}}"
+          value: "{{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "{{ include "common.servicename" .  }}"
         - name: KAFKA_BROKER_ID