[DMAAP-STRIMZI] Move strimzi kafka bridge

[oom.git] / kubernetes / dmaap / components / message-router / templates / statefulset.yaml

diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index 174eb2c..904c160 100644 (file)
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -69,6 +69,7 @@ spec:
       {{- end }}
         - name: srimzi-zk-entrance
           image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.zookeeper.entrance.image }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command:
             - /opt/stunnel/stunnel_run.sh
           ports:
@@ -80,7 +81,6 @@ spec:
               value: debug
             - name: STRIMZI_ZOOKEEPER_CONNECT
               value: '{{ include "common.release" . }}-strimzi-zookeeper-client:{{ .Values.global.zkTunnelService.internalPort }}'
-          imagePullPolicy: Always
           livenessProbe:
             exec:
               command:
@@ -150,9 +150,11 @@ spec:
           - name: JAASLOGIN
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "mr-kafka-admin-secret" "key" "sasl.jaas.config") | indent 12 }}
           - name: SASLMECH
-            value: {{ .Values.global.saslMechanism }}
+            value: scram-sha-512
           - name: enableCadi
             value: "{{ .Values.global.aafEnabled }}"
+          - name: useZkTopicStore
+            value: "false"
           volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
           - mountPath: /etc/localtime
             name: localtime