From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 1 Apr 2021 05:32:17 +0000 (+0000)
Subject: Merge "[DMAAP] Fix scaling logic for message router kafka and zookeeper"
X-Git-Tag: 8.0.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=55c599efa5dd8f70e16a595f7ecc865c70995e24

Merge "[DMAAP] Fix scaling logic for message router kafka and zookeeper"
---

55c599efa5dd8f70e16a595f7ecc865c70995e24
diff --cc kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
index 62a25e67d8,ba872a310a..c16500e787
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
@@@ -166,9 -164,11 +166,9 @@@ spec
                apiVersion: v1
                fieldPath: status.hostIP
          - name: KAFKA_ZOOKEEPER_CONNECT
-           value: {{ include "common.release" . }}-{{.Values.zookeeper.name}}-0.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{ include "common.release" . }}-{{.Values.zookeeper.name}}-1.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{ include "common.release" . }}-{{.Values.zookeeper.name}}-2.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}}
+           value: "{{ include "common.kafkaNodes" (dict "dot" . "replicaCount" .Values.zookeeper.replicaCount "componentName" .Values.zookeeper.name "port" .Values.zookeeper.port ) }}"
          - name: KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE
            value: "{{ .Values.kafka.enableSupport }}"
 -        - name: KAFKA_OPTS
 -          value: "{{ .Values.kafka.jaasOptions }}"
          {{- if  .Values.global.aafEnabled }}
          - name: KAFKA_OPTS
            value: "{{ .Values.kafka.jaasOptionsAaf }}"