X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fonap%2Fvalues.yaml;h=ca9ccd48f4deaced9da58aa08017c635d0d90fd2;hb=ad0f69e402aaff1e19a5330f3949d3f445b949b5;hp=53769409383da510a9244fc16261380a50acc14f;hpb=581f2b17fd0b247eeeb4e3770b212c7e6cd631fb;p=oom.git

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 5376940938..ca9ccd48f4 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2019 Amdocs, Bell Canada
 # Copyright (c) 2020 Nordix Foundation, Modifications
-# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2020-2021 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@ global:
   nginxImage: bitnami/nginx:1.18-debian-10
 
   # postgreSQL client and server image
-  postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+  postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
 
   # readiness check image
   readinessImage: onap/oom/readiness:3.0.1
@@ -172,10 +172,15 @@ global:
   aafEnabled: true
   aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
- # default values for certificates
+  # Disabling MSB
+  # POC Mode, only for use in development environment
+  msbEnabled: true
+
+  # default values for certificates
   certificate:
     default:
-      renewBefore: 8h
+      renewBefore: 720h #30 days
+      duration:    8760h #365 days
       subject:
         organization: "Linux-Foundation"
         country: "US"
@@ -186,42 +191,30 @@ global:
         group: certmanager.onap.org
         kind: CMPv2Issuer
         name: cmpv2-issuer-onap
-      p12Keystore:
-        create: false
-        passwordSecretRef:
-          name: ""
-          key:  ""
-      jksKeystore:
-        create: false
-        passwordSecretRef:
-          name: ""
-          key:  ""
 
   # Enabling CMPv2
   cmpv2Enabled: true
   CMPv2CertManagerIntegration: false
   platform:
+    certificates:
+      clientSecretName: oom-cert-service-client-tls-secret
+      keystoreKeyRef: keystore.jks
+      truststoreKeyRef: truststore.jks
+      keystorePasswordSecretName: oom-cert-service-certificates-password
+      keystorePasswordSecretKey: password
+      truststorePasswordSecretName: oom-cert-service-certificates-password
+      truststorePasswordSecretKey: password
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.2
-      secret:
-        name: oom-cert-service-client-tls-secret
-        mountPath: /etc/onap/oom/certservice/certs/
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3
+      certificatesSecretMountPath: /etc/onap/oom/certservice/certs/
       envVariables:
+        certPath: "/var/custom-certs"
         # Certificate related
-        cmpv2Organization: "Linux-Foundation"
-        cmpv2OrganizationalUnit: "ONAP"
-        cmpv2Location: "San-Francisco"
-        cmpv2State: "California"
-        cmpv2Country: "US"
-        # Client configuration related
         caName: "RA"
+        # Client configuration related
         requestURL: "https://oom-cert-service:8443/v1/certificate/"
         requestTimeout: "30000"
-        keystorePath: "/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks"
         outputType: "P12"
-        keystorePassword: "secret"
-        truststorePath: "/etc/onap/oom/certservice/certs/truststore.jks"
-        truststorePassword: "secret"
 
   # Indicates offline deployment build
   # Set to true if you are rendering helm charts for offline deployment
@@ -305,10 +298,16 @@ consul:
 # addTestingComponents
 contrib:
   enabled: *testing
+cps:
+  enabled: false
 dcaegen2:
   enabled: false
+dcaegen2-services:
+  enabled: false
 dcaemod:
   enabled: false
+holmes:
+  enabled: false
 dmaap:
   enabled: false
 esr: