[CPS] Update cps-and-ncmp and dmi-plugin image
- updating cps-and-ncmp docker image to 3.2.6
- updating ncmp-dmi-plugin docker image to 1.3.0 and adding JAAS config
- temporarily removing the faulty link
Issue-ID: CPS-1589
Change-Id: Ia57af84137b02a090191cb29c66bd6cdf85f7aeb
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index 1c15a2d..7d764bf 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@ -49,9 +49,12 @@
onap:
cps: {{ .Values.logging.cps }}
+{{- with (first .Values.kafkaUser.acls) }}
+spring.kafka.consumer.group-id: {{ .name }}
+{{- end }}
spring.kafka.bootstrap-servers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
spring.kafka.security.protocol: SASL_PLAINTEXT
-spring.kafka.properties.sasl.mechanism: SCRAM-SHA-512
+spring.kafka.properties.sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
{{- if .Values.config.additional }}