From 598f2d8f5e84c92c42c5da0e4dbf9562f860b8f7 Mon Sep 17 00:00:00 2001
From: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Date: Tue, 1 Jun 2021 12:36:13 +0200
Subject: [COMMON] Remove CertService client mechanism

- Remove cmpv2Certificate chart in order to deprecate CertService
client mechanism.
- Remove CertServiceClient init containers in SDNC.
- Replace CMPv2CertManagerIntegration with cmpv2Enabled flag

Issue-ID: OOM-2744
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: I8c818fcf64a029552c8833f68b6ae95fad379c8d
---
 kubernetes/onap/resources/overrides/onap-all.yaml  |  1 -
 .../overrides/oom-cert-service-environment.yaml    | 28 ++++++++++++----------
 kubernetes/onap/values.yaml                        | 12 ----------
 3 files changed, 15 insertions(+), 26 deletions(-)

(limited to 'kubernetes/onap')

diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index d6c447240d..521cf2ff8b 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -20,7 +20,6 @@
 global:
   addTestingComponents: &testing true
   centralizedLoggingEnabled: &centralizedLogging false
-  CMPv2CertManagerIntegration: false
 cassandra:
   enabled: true
 mariadb-galera:
diff --git a/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
index 643d3065c1..7b3603c041 100644
--- a/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
+++ b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2020 Nordix Foundation
-# 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.
@@ -35,15 +35,17 @@
 #################################################################
 global:
   cmpv2Enabled: true
-  CMPv2CertManagerIntegration: true
-  platform:
-    certServiceClient:
-      envVariables:
-        # Certificate related
-        cmpv2Organization: "Linux-Foundation"
-        cmpv2OrganizationalUnit: "ONAP"
-        cmpv2Location: "San-Francisco"
-        cmpv2State: "California"
-        cmpv2Country: "US"
-        # Client configuration related
-        caName: "RA"
+  certificate:
+    default:
+      renewBefore: 720h #30 days
+      duration:    8760h #365 days
+      subject:
+        organization: "Linux-Foundation"
+        country: "US"
+        locality: "San-Francisco"
+        province: "California"
+        organizationalUnit: "ONAP"
+      issuer:
+        group: certmanager.onap.org
+        kind: CMPv2Issuer
+        name: cmpv2-issuer-onap
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index d91284a6c3..0e2b13b473 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -194,7 +194,6 @@ global:
 
   # Enabling CMPv2
   cmpv2Enabled: true
-  CMPv2CertManagerIntegration: false
   platform:
     certificates:
       clientSecretName: oom-cert-service-client-tls-secret
@@ -204,17 +203,6 @@ global:
       keystorePasswordSecretKey: password
       truststorePasswordSecretName: oom-cert-service-certificates-password
       truststorePasswordSecretKey: password
-    certServiceClient:
-      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
-        caName: "RA"
-        # Client configuration related
-        requestURL: "https://oom-cert-service:8443/v1/certificate/"
-        requestTimeout: "30000"
-        outputType: "P12"
 
   # Indicates offline deployment build
   # Set to true if you are rendering helm charts for offline deployment
-- 
cgit 1.2.3-korg