Merge "[CPS] Service Mesh Compliance for CPS"

diff --combined kubernetes/cps/components/cps-core/values.yaml
index d41c44d,b747b71..eb7aa54
--- 1/kubernetes/cps/components/cps-core/values.yaml
--- 2/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@@ -52,18 -52,8 +52,18 @@@ 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
 +      name2: tcp-pgset-primary
 +      name3: tcp-pgset-replica
 +    container:
 +      name: postgres
 +
 +image: onap/cps-and-ncmp:2.0.1
  containerPort: &svc_port 8080
  managementPort: &mgt_port 8081
  
@@@ -73,7 -63,7 +73,7 @@@ service
    ports:
      - name: &port http
        port: *svc_port
-     - name: management
+     - name: http-management
        port: *mgt_port
        targetPort: *mgt_port
  
@@@ -83,7 -73,7 +83,7 @@@ prometheus
  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
@@@ -216,21 -206,9 +216,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: