Merge "[MULTICLOUD] Move multicloud k8s to use strimzi kafka user template"

diff --combined kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 571360d,117f6fa..ed6b64c
--- 1/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
--- 2/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@@ -62,7 -62,8 +62,7 @@@ spec
            - mountPath: /opt/multicloud/k8splugin/k8sconfig.json
              name: {{ include "common.name" .}}
              subPath: k8sconfig.json
 -        resources:
 -{{ include "common.resources" . | indent 10 }}
 +        resources: {{ include "common.resources" . | nindent 10 }}
          {{- if .Values.nodeSelector }}
          nodeSelector:
  {{ toYaml .Values.nodeSelector | indent 10 }}
@@@ -86,12 -87,11 +86,11 @@@
          - mountPath: /data
            name: artifact-data
          env:
-         - name: SECURITY_PROTOCOL
-           value: {{ .Values.config.kafka.securityProtocol }}
-         - name: SASL_MECHANISM
-           value: {{ .Values.config.kafka.saslMechanism }}
          - name: SASL_JAAS_CONFIG
-           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "multicloud-k8s-sdc-kafka-secret" "key" "sasl.jaas.config") | indent 10 }}
+           valueFrom:
+             secretKeyRef:
+               name: {{ include "common.name" . }}-ku
+               key: sasl.jaas.config
        serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
        volumes:
        - name: localtime