From 6c75f5db26c1d768f29d1190cee04dc2effb3422 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Thu, 16 Sep 2021 08:38:01 +0200 Subject: [DMAAP][MR] Allow kafka to run with < 3 replicas Current hardcoded configuration doesn't allow kafka to be run with less than 3 replicas. This patchs fixes this. Issue-ID: OOM-2831 Signed-off-by: Sylvain Desbureaux Change-Id: Iffd78a3eaa808e62a74fbc08f26e19f1644440df --- .../components/message-router-kafka/templates/statefulset.yaml | 6 ++++++ .../message-router/components/message-router-kafka/values.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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 c16500e787..d7d7a31ea9 100644 --- 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 04d7cee705..3e04616054 100644 --- 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,19 +77,19 @@ 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" - "offsets.topic.replication.factor": "3" "transaction.state.log.replication.factor": "1" "transaction.state.log.min.isr": "1" "num.recovery.threads.per.data.dir": "5" "log.retention.hours": "168" "zookeeper.connection.timeout.ms": "6000" - "default.replication.factor": "3" "zookeeper.set.acl": "true" jmx: -- cgit 1.2.3-korg