Merge "[CPS-STRIMZI] Migrate cps to use strimzi kafka"

diff --combined kubernetes/strimzi/templates/strimzi-kafka.yaml
index df3afee,1afb5fd..5f1e730
--- 1/kubernetes/strimzi/templates/strimzi-kafka.yaml
--- 2/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@@ -57,16 -57,18 +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: