X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcps%2Fcomponents%2Fcps-core%2Fresources%2Fconfig%2Fapplication-helm.yml;h=980be74367136282a38807519fe600204f146edf;hb=1734ba109dc0a0aa50a64d7029f4cad30bcbb3c6;hp=fd3068e6a65d1e988d6814d52437e920e687ecc6;hpb=5a2ba4cbff6acb73d96ae4550dce0252b316ad7c;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 fd3068e6a6..980be74367 100644
--- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
@@ -30,15 +30,15 @@ spring:
     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
+# 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}
@@ -62,9 +62,21 @@ spring.kafka.security.protocol: SASL_PLAINTEXT
 spring.kafka.properties.sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
 spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
 
+# 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.