[CPS] Upgrade docker images to Jakarta

[oom.git] / kubernetes / cps / components / cps-core / values.yaml

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 55d9fcd..d65924e 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -1,4 +1,5 @@
-#  Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Modifications Copyright (C) 2022 Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,12 +59,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.0
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -73,17 +77,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
@@ -198,11 +201,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