Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[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 1afb5fd..4e8779d 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -57,7 +57,7 @@ spec:
     authorization:
       type: simple
       superUsers:
-        - {{ include "common.release" . }}-{{ .Values.kafkaStrimziAdminUser }}
+        - {{ .Values.kafkaStrimziAdminUser }}
     template:
       pod:
         securityContext:
@@ -73,7 +73,6 @@ spec:
       inter.broker.protocol.version: "3.0"
     storage:
       type: jbod
-      class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
       volumes:
       - id: 0
         type: persistent-claim
@@ -89,6 +88,10 @@ spec:
     replicas: {{ .Values.replicaCount }}
     config:
       ssl.hostnameVerification: false
+      ssl.quorum.hostnameVerification: false
+      {{- if (include "common.onServiceMesh" .) }}
+      sslQuorum: false
+      {{- end }}
     storage:
       type: persistent-claim
       size: {{ .Values.persistenceZk.size }}