Merge "[SDC] Update SDC docker versions to 1.10.1"

[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 4f788e7..3da5d17 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.
@@ -52,8 +53,21 @@ global:
   ingress:
     virtualhost:
       baseurl: "simpledemo.onap.org"
-
-image: onap/cps-and-ncmp:2.0.0
+  #Service Names of the postgres db to connect to.
+  #Override it to cps-postgres if localCluster is enabled.
+  postgres:
+    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.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -63,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
@@ -188,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
@@ -206,9 +223,21 @@ postgres:
     pgUserExternalSecret: *pgUserCredsSecretName
     pgRootPasswordExternalSecret: *pgRootPassSecretName
 
+postgres-init:
+  nameOverride: cps-postgres-init
+  config:
+    pgUserName: cps
+    pgDatabase: cpsdb
+    pgDataPath: data
+    pgUserExternalSecret: *pgUserCredsSecretName
+
+    # pgPrimaryPassword: password
+    # pgUserPassword: password
+    # pgRootPassword: password
+
 readinessCheck:
   wait_for:
-    - *postgresName
+    - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
 
 minReadySeconds: 10
 updateStrategy: