X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcps%2Fcomponents%2Fcps-core%2Fresources%2Fconfig%2Fapplication-helm.yml;h=81b81341e5a1ec4395915ab6d908f84ff9bdbd8a;hb=refs%2Fheads%2Fmaster;hp=8f904efeae1ecb0a12d3226d47e14022ee623a00;hpb=1d08808841edcea39acdff8ae2fd014ebd4fe75b;p=oom.git

diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
index 8f904efeae..980be74367 100644
--- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
@@ -1,7 +1,7 @@
 {{/*
 #  Copyright (C) 2021 Pantheon.tech
 #  Modifications Copyright (C) 2020 Bell Canada.
-#  Modifications Copyright (C) 2021 Nordix Foundation.
+#  Modifications Copyright (C) 2021-2023 Nordix Foundation.
 #  Modifications Copyright (C) 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,41 +20,63 @@
 spring:
   datasource:
 {{- if .Values.global.postgres.localCluster }}
-    url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+    url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:{{ .Values.postgres.service.externalPort2 }}/{{ .Values.postgres.config.pgDatabase }}
 {{- else }}
-    url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+    url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:{{ .Values.global.postgres.service.externalPort2 }}/{{ .Values.postgres.config.pgDatabase }}
 {{- end }}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driverClassName: org.postgresql.Driver
     initialization-mode: always
-
   liquibase:
     change-log: classpath:changelog/changelog-master.yaml
-    labels: {{ .Values.config.liquibaseLabels }}
+    label-filter: {{ .Values.config.liquibaseLabels }}
+
+  kafka:
+    producer:
+      client-id: cps-core
 
 security:
-    # comma-separated uri patterns which do not require authorization
-    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/api-docs
-    auth:
-        username: ${CPS_USERNAME}
-        password: ${CPS_PASSWORD}
+# comma-separated uri patterns which do not require authorization
+  permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**,/v3/api-docs/**
+  auth:
+    username: ${CPS_USERNAME}
+    password: ${CPS_PASSWORD}
+
 logging:
   level:
     org:
       springframework: {{ .Values.logging.level }}
 
-dmi:
-  auth:
-    username: ${DMI_USERNAME}
-    password: ${DMI_PASSWORD}
+ncmp:
+  dmi:
+    auth:
+      username: ${DMI_USERNAME}
+      password: ${DMI_PASSWORD}
+
+{{- 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.eventPublisher }}
-{{ toYaml .Values.config.eventPublisher | nindent 2 }}
+# Kafka Topics
+{{- if .Values.topics.config }}
+{{ toYaml .Values.topics.config | nindent 2 }}
 {{- end }}
 
 {{- if .Values.config.additional }}
 {{ toYaml .Values.config.additional | nindent 2 }}
 {{- end }}
+
+# Custom Hazelcast config.
+hazelcast:
+  mode:
+    kubernetes:
+      enabled: {{ .Values.hazelcast.config.kubernetesDiscovery }}
+      service-name: {{ .Values.hazelcast.config.kubernetesServiceName }}
+
 # Last empty line is required otherwise the last property will be missing from application.yml file in the pod.