From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Mon, 6 Mar 2023 13:24:09 +0000 (+0000)
Subject: Merge "[MULTICLOUD] Move multicloud k8s to use strimzi kafka user template"
X-Git-Tag: 12.0.0~102
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1e11f68db4b75dff8d281358fcd837ddbc6cdff0;hp=-c;p=oom.git

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

1e11f68db4b75dff8d281358fcd837ddbc6cdff0
diff --combined kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 571360da1c,117f6faac7..ed6b64c198
--- a/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