Merge "[DMAAP][MR] Allow kafka to run with < 3 replicas"

diff --git 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
index 7cedbf8..ebb5f7e 100644 (file)
--- 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
@@ -169,6 +169,12 @@ spec:
           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_OFFSETS_TOPIC_REPLICATION_FACTOR
+          value: "{{ .Values.config.offsets_topic_replication_factor | default .Values.replicaCount }}"
+        - name: KAFKA_NUM_PARTITIONS
+          value: "{{ .Values.config.num_partition | default .Values.replicaCount }}"
+        - name:  KAFKA_DEFAULT_REPLICATION_FACTOR
+          value: "{{ .Values.config.default_replication_factor | default .Values.replicaCount }}"
         {{- if  .Values.global.aafEnabled }}
         - name: KAFKA_OPTS
           value: "{{ .Values.kafka.jaasOptionsAaf }}"

diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
index 16a4c0f..be0de96 100644 (file)
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
@@ -77,17 +77,18 @@ kafka:
   interBrokerListernerAaf: INTERNAL_SASL_PLAINTEXT
   interBrokerListerner: INTERNAL_PLAINTEXT
 
+config: {}
+  # offsets_topic_replication_factor:
+  # num_partition:
+  # default_replication_factor:
 
 configurationOverrides:
-  "offsets.topic.replication.factor": "3"
   "log.dirs": "/var/lib/kafka/data"
   "log.retention.hours": "168"
-  "num.partitions": "3"
   "transaction.state.log.replication.factor": "1"
   "transaction.state.log.min.isr": "1"
   "num.recovery.threads.per.data.dir": "5"
   "zookeeper.connection.timeout.ms": "6000"
-  "default.replication.factor": "3"
   "zookeeper.set.acl": "true"
 
 jmx: