Merge "[DCAEGEN2] Update cm-container and consul-loader"

[oom.git] / kubernetes / onap / values.yaml

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index c416f0d..0920222 100755 (executable)
--- 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.
@@ -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,27 +191,18 @@ 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:
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.1
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3
       secret:
         name: oom-cert-service-client-tls-secret
         mountPath: /etc/onap/oom/certservice/certs/
       envVariables:
+        certPath: "/var/custom-certs"
         # Certificate related
         cmpv2Organization: "Linux-Foundation"
         cmpv2OrganizationalUnit: "ONAP"