X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcps%2Fcomponents%2Fcps-core%2Fvalues.yaml;h=c548abbd2377b3407fec8628968f69ceb051eb93;hb=0a3d66a208b8b488fe4777611ab648d22669734f;hp=55d9fcde660fd42dd38867f0a400d912080ecc5d;hpb=7f1ea9fb552991f2ba3fa52683f494e37157e34a;p=oom.git

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 55d9fcde66..c548abbd23 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -1,4 +1,6 @@
-#  Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Modifications Copyright (C) 2022 Bell Canada
+# Modifications Copyright © 2022 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,6 +43,13 @@ secrets:
     login: '{{ .Values.config.dmiPluginUserName }}'
     password: '{{ .Values.config.dmiPluginUserPassword }}'
     passwordPolicy: generate
+  - uid: cps-kafka-user
+    externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+    type: genericKV
+    envs:
+      - name: sasl.jaas.config
+        value: '{{ .Values.config.someConfig }}'
+        policy: generate
 
 #################################################################
 # Global configuration defaults.
@@ -58,12 +67,15 @@ global:
     localCluster: false
     service:
       name: pgset
+      externalPort: 5432
       name2: tcp-pgset-primary
+      externalPort2: 5432
       name3: tcp-pgset-replica
+      externalPort3: 5432
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:2.0.0
+image: onap/cps-and-ncmp:3.0.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -73,17 +85,16 @@ service:
   ports:
     - name: &port http
       port: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
 prometheus:
-  enabled: true
+  enabled: false
 
 metrics:
   serviceMonitor:
-    enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
@@ -167,17 +178,23 @@ config:
   #appUserPassword:
   dmiPluginUserName: dmiuser
 # Any new property can be added in the env by setting in overrides in the format mentioned below
-# All the added properties must be in "key: value" format insead of yaml.
+# All the added properties must be in "key: value" format instead of yaml.
 #  additional:
 #    spring.config.max-size: 200
 #    spring.config.min-size: 10
 
-  eventPublisher:
-    spring.kafka.bootstrap-servers: message-router-kafka:9092
-    spring.kafka.security.protocol: SASL_PLAINTEXT
-    spring.kafka.properties.sasl.mechanism: PLAIN
-    spring.kafka.properties.sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username=admin password=admin_secret;
-    spring.kafka.producer.client-id: cps-core
+# kafka config
+  useStrimziKafka: true
+  kafkaBootstrap: strimzi-kafka-bootstrap
+# If targeting a custom kafka cluster, ie useStrimziKakfa: false
+# uncomment below config and target your kafka bootstrap servers,
+# along with any other security config.
+
+#  eventPublisher:
+#    spring.kafka.bootstrap-servers: <kafka-bootstrap>:9092
+#    spring.kafka.security.protocol: SASL_PLAINTEXT
+#    spring.kafka.properties.sasl.mechanism: PLAIN
+#    spring.kafka.properties.sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username=admin password=admin_secret;
 
   additional:
     notification.data-updated.enabled: true
@@ -198,11 +215,15 @@ logging:
 # Postgres overriding defaults in the postgres
 #################################################################
 postgres:
+  postgresInit: true
   nameOverride: &postgresName cps-core-postgres
   service:
     name: *postgresName
+    externalPort: 5432
     name2: cps-core-pg-primary
+    externalPort2: 5432
     name3: cps-core-pg-replica
+    externalPort3: 5432
   container:
     name:
       primary: cps-core-pg-primary