X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Fcps%2Fvalues.yaml;h=e15cd1080bc45bdd9240d7301be6ffa8de385fb9;hb=c615a89cf73c543e2a16660efac45f4b6c689f3f;hp=77ebb09dd97a88ee2fb2040ec8d8f4699ec98928;hpb=55c599efa5dd8f70e16a595f7ecc865c70995e24;p=oom.git

diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index 77ebb09dd9..e15cd1080b 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -1,4 +1,4 @@
-#  Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Copyright (C) 2021 Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,148 +13,34 @@
 # limitations under the License.
 
 #################################################################
-# Secrets.
+# Global configuration defaults.
 #################################################################
 secrets:
-  - uid: pg-root-pass
-    name: &pgRootPassSecretName '{{ include "common.release" . }}-cps-pg-root-pass'
-    type: password
-    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "cps-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
-    password: '{{ .Values.postgres.config.pgRootpassword }}'
-    policy: generate
-  - uid: pg-user-creds
-    name: &pgUserCredsSecretName '{{ include "common.release" . }}-cps-pg-user-creds'
-    type: basicAuth
-    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "cps-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
-    login: '{{ .Values.postgres.config.pgUserName }}'
-    password: '{{ .Values.postgres.config.pgUserPassword }}'
-    passwordPolicy: generate
-  - uid: app-user-creds
+  - uid: core-app-user-creds
+    name: &core-creds-secret '{{ include "common.release" . }}-cps-core-app-user-creds'
     type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
-    login: '{{ .Values.config.appUserName }}'
-    password: '{{ .Values.config.appUserPassword }}'
+    externalSecret: '{{ tpl (default "" .Values.config.coreUserExternalSecret) . }}'
+    login: '{{ .Values.config.coreUserName }}'
+    password: '{{ .Values.config.coreUserPassword }}'
     passwordPolicy: generate
 
-#################################################################
-# Global configuration defaults.
-#################################################################
 
-# bitnami image doesn't support well single quote in password
 passwordStrengthOverride: basic
 global:
   ingress:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/cps-and-nf-proxy:1.0.0
-containerPort: &svc_port 8080
-
-service:
-  type: ClusterIP
-  name: cps
-  ports:
-    - name: &port http
-      port: *svc_port
+config:
+  coreUserName: cpsuser
 
-pullPolicy: Always
-# flag to enable debugging - application support required
-debugEnabled: false
-nodeSelector: {}
-affinity: {}
-# Resource Limit flavor -By Default using small
-flavor: small
-# default number of instances
-replicaCount: 1
-# Segregation for Different environment (Small and Large)
-resources:
-  small:
-    limits:
-      cpu: 2
-      memory: 2Gi
-    requests:
-      cpu: 1
-      memory: 1Gi
-  large:
-    limits:
-      cpu: 4
-      memory: 4Gi
-    requests:
-      cpu: 2
-      memory: 2Gi
-  unlimited: {}
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 20
-  periodSeconds: 20
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
+# Enable all CPS components by default
+cps-core:
   enabled: true
-  path: /manage/health
-  port: *port
-
-readiness:
-  initialDelaySeconds: 15
-  periodSeconds: 15
-  path: /manage/health
-  port: *port
+  config:
+    appUserExternalSecret: *core-creds-secret
 
-ingress:
+ncmp-dmi-plugin:
   enabled: true
-  service:
-    - baseaddr: "cps"
-      path: "/"
-      name: "cps"
-      port: *svc_port
-
-serviceAccount:
-  nameOverride: cps
-  roles:
-    - read
-
-securityContext:
-  user_id: 100
-  group_id: 655533
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-config:
-
-  # Set it for pre loading xnfdata, else set to null
-  liquibaseLabels: xnf-data-preload
-
-  # REST API basic authentication credentials (passsword is generated if not provided)
-  appUserName: cpsuser
-  #appUserPassword:
-
-logging:
-  level: INFO
-  path: /tmp
-
-#################################################################
-# Postgres overriding defaults in the postgres
-#################################################################
-postgres:
-  nameOverride: &postgresName cps-postgres
-  service:
-    name: *postgresName
-    name2: cps-pg-primary
-    name3: cps-pg-replica
-  container:
-    name:
-      primary: cps-pg-primary
-      replica: cps-pg-replica
-  persistence:
-    mountSubPath: cps/data
-    mountInitPath: cps
   config:
-    pgUserName: cps
-    pgDatabase: cpsdb
-    pgUserExternalSecret: *pgUserCredsSecretName
-    pgRootPasswordExternalSecret: *pgRootPassSecretName
-
-readinessCheck:
-  wait_for:
-    - cps-postgres
+    coreCredsExternalSecret: *core-creds-secret