Merge "[AAI] Helm changes for DMaaP deprecation"

diff --cc kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
Simple merge

diff --cc kubernetes/aai/components/aai-graphadmin/values.yaml
index d3609a9,46e81c8..89d27a8
--- 1/kubernetes/aai/components/aai-graphadmin/values.yaml
--- 2/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@@ -291,7 -295,21 +295,24 @@@ serviceAccount
  #Log configuration
  log:
    path: /var/log/onap
 +  level:
 +    root: DEBUG
 +    base: DEBUG
  logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+ #################################################################
+ # Secrets metaconfig
+ #################################################################
+ secrets:
+   - uid: aai-graph-kafka-user
+     externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+     type: genericKV
+     envs:
+       - name: sasl.jaas.config
+         value: '{{ .Values.config.someConfig }}'
+         policy: generate
+ kafkaUser:
+   authenticationType: scram-sha-512
+   acls:
+     - name: AAI-EVENT
+       type: topic
+       operations: [Read, Write]

diff --cc kubernetes/aai/components/aai-resources/resources/config/logback.xml
Simple merge

diff --cc kubernetes/aai/components/aai-resources/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-traversal/resources/config/logback.xml
Simple merge

diff --cc kubernetes/aai/components/aai-traversal/values.yaml
index f6194b8,a644698..dd06a28
--- 1/kubernetes/aai/components/aai-traversal/values.yaml
--- 2/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@@ -368,7 -373,21 +373,24 @@@ serviceAccount
  #Log configuration
  log:
    path: /var/log/onap
 +  level:
 +    root: DEBUG
 +    base: DEBUG # base package (org.onap.aai)
  logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+ #################################################################
+ # Secrets metaconfig
+ #################################################################
+ secrets:
+   - uid: aai-trav-kafka-user
+     externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+     type: genericKV
+     envs:
+       - name: sasl.jaas.config
+         value: '{{ .Values.config.someConfig }}'
+         policy: generate
+ kafkaUser:
+   authenticationType: scram-sha-512
+   acls:
+     - name: AAI-EVENT
+       type: topic
+       operations: [Read, Write]