X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcps%2Fcomponents%2Fcps-temporal%2Fresources%2Fconfig%2Fapplication-helm.yml;h=bede7f1fdcad6abad8677b27a98362a187fdc2d8;hb=refs%2Fheads%2Fmaster;hp=6654b265560adcda41dfc5765df9f1f6379c1bea;hpb=971fac5ee071235248d6bc02dca1df55ac652dae;p=oom.git

diff --git a/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml b/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml
index 6654b26556..bede7f1fdc 100644
--- a/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-temporal/resources/config/application-helm.yml
@@ -1,6 +1,7 @@
 {{/*
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2022-2023 Nordix Foundation
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,25 +24,27 @@ spring:
     url: jdbc:postgresql://{{ .Values.timescaledb.service.name }}:5432/{{ .Values.timescaledb.config.pgDatabase }}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
-  kafka:
-    bootstrap-servers: [{{ .Values.config.kafka.service }}:{{ .Values.config.kafka.port }}]
-    security:
-      protocol: {{ .Values.config.kafka.protocol }}
-    consumer:
-      group-id: {{ .Values.config.kafka.consumerGroupId }}
-
-security:
-  auth:
-    username: ${APP_USERNAME}
-    password: ${APP_PASSWORD}
 
 app:
   listener:
     data-updated:
-      topic: {{ .Values.config.kafka.listenerTopic }}
+      topic: {{ .Values.config.app.listener.dataUpdatedTopic }}
+
+{{- 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: {{ .Values.kafkaUser.authenticationType | upper }}
+spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
 
 {{- if .Values.config.additional }}
 {{ toYaml .Values.config.additional | nindent 2 }}
 {{- end }}
 
+security:
+  auth:
+    username: ${APP_USERNAME}
+    password: ${APP_PASSWORD}
+
 # Last empty line is required otherwise the last property will be missing from application.yml file in the pod.