From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 8 Jan 2021 10:03:50 +0000 (+0000)
Subject: Merge "[CMPV2] Add a template for Certificate (cert-manager)"
X-Git-Tag: 8.0.0~169
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=66d9e19d299cb8c08c11676a7cdfc464e4a776db

Merge "[CMPV2] Add a template for Certificate (cert-manager)"
---

66d9e19d299cb8c08c11676a7cdfc464e4a776db
diff --cc kubernetes/onap/values.yaml
index 9f6d5fe35d,c416f0ddec..5376940938
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -172,11 -172,37 +172,37 @@@ global
    aafEnabled: true
    aafAgentImage: onap/aaf/aaf_agent:2.1.20
  
+  # default values for certificates
+   certificate:
+     default:
+       renewBefore: 8h
+       subject:
+         organization: "Linux-Foundation"
+         country: "US"
+         locality: "San-Francisco"
+         province: "California"
+         organizationalUnit: "ONAP"
+       issuer:
+         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.2
        secret:
          name: oom-cert-service-client-tls-secret
          mountPath: /etc/onap/oom/certservice/certs/
diff --cc kubernetes/sdnc/values.yaml
index 6df908e2cb,44e179114e..1d2fa266ea
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -32,9 -32,10 +32,10 @@@ global
      service: mariadb-galera
    # 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.2
        secret:
          name: oom-cert-service-client-tls-secret
          mountPath: /etc/onap/oom/certservice/certs/