Merge "[STRIMZI] Make Strimzi ServiceMesh compatible"

[oom.git] / kubernetes / strimzi / templates / strimzi-kafka.yaml

diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index a94879b..06802da 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -57,16 +57,18 @@ spec:
     authorization:
       type: simple
       superUsers:
-        - {{ include "common.release" . }}-{{ .Values.kafkaStrimziAdminUser }}
+        - {{ .Values.kafkaStrimziAdminUser }}
     template:
       pod:
         securityContext:
           runAsUser: 0
           fsGroup: 0
     config:
+      default.replication.factor: {{ .Values.replicaCount }}
+      min.insync.replicas: {{ .Values.replicaCount }}
       offsets.topic.replication.factor: {{ .Values.replicaCount }}
       transaction.state.log.replication.factor: {{ .Values.replicaCount }}
-      transaction.state.log.min.isr: 2
+      transaction.state.log.min.isr: {{ .Values.replicaCount }}
       log.message.format.version: "3.0"
       inter.broker.protocol.version: "3.0"
     storage:
@@ -87,6 +89,9 @@ spec:
     replicas: {{ .Values.replicaCount }}
     config:
       ssl.hostnameVerification: false
+      {{- if (include "common.onServiceMesh" .) }}
+      sslQuorum: false
+      {{- end }}
     storage:
       type: persistent-claim
       size: {{ .Values.persistenceZk.size }}