X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=efc13e92e652d58c65d3ac62d30a0f6c4aefb637;hb=cf8f42f496f9f062964f0b62a4de7ba2ef0a72ee;hp=faf6594e2ad5e9c5042575a08695d6e336d9a165;hpb=086e3d9388d25df3df65bb06422ad25a0f476d9b;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index faf6594e2a..efc13e92e6 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2020 Samsung Electronics, highstreet technologies GmbH
 # Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2021 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,33 +30,8 @@ global:
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
-    service: mariadb-galera
-  # Enabling CMPv2
-  cmpv2Enabled: true
+  # Enabling CMPv2 with CertManager
   CMPv2CertManagerIntegration: false
-  platform:
-    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/
-      envVariables:
-        # Certificate related
-        cert_path: /var/custom-certs
-        cmpv2Organization: "Linux-Foundation"
-        cmpv2OrganizationalUnit: "ONAP"
-        cmpv2Location: "San-Francisco"
-        cmpv2Country: "US"
-        # Client configuration related
-        caName: "RA"
-        common_name: "sdnc.simpledemo.onap.org"
-        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"
 
 #################################################################
 # Secrets metaconfig
@@ -97,6 +73,14 @@ secrets:
     password: '{{ .Values.config.odlPassword }}'
     # For now this is left hardcoded but should be revisited in a future
     passwordPolicy: required
+  - uid: dmaap-proxy-creds
+    name: &dmaapProxyCredsSecretName '{{ include "common.release" . }}-sdnc-dmaap-proxy-creds'
+    type: basicAuth
+    externalSecret: '{{ .Values.config.dmaapProxyCredsExternalSecret }}'
+    login: '{{ .Values.config.sdnr.dmaapProxy.user }}'
+    password: '{{ .Values.config.sdnr.dmaapProxy.password }}'
+    # For now this is left hardcoded but should be revisited in a future
+    passwordPolicy: required
   - uid: netbox-apikey
     type: password
     externalSecret: '{{ .Values.config.netboxApikeyExternalSecret }}'
@@ -133,27 +117,24 @@ secrets:
     login: '{{ .Values.config.scaleoutUser }}'
     password: '{{ .Values.config.scaleoutPassword }}'
     passwordPolicy: required
-  - uid: keystore-password
-    type: password
-    password: secret
-    passwordPolicy: required
 #################################################################
 # Certificates
 #################################################################
 certificates:
-  - commonName: sdnc.simpledemo.onap.org
+  - mountPath:  /var/custom-certs
+    commonName: sdnc.simpledemo.onap.org
     dnsNames:
         - sdnc.simpledemo.onap.org
-    p12Keystore:
-      create: true
-      passwordSecretRef:
-        name: keystore-password
-        key: password
-    jksKeystore:
-      create: true
+    keystore:
+      outputType:
+        - jks
       passwordSecretRef:
-        name: keystore-password
+        name: sdnc-cmpv2-keystore-password
         key: password
+    issuer:
+      group: certmanager.onap.org
+      kind: CMPv2Issuer
+      name: cmpv2-issuer-onap
 #################################################################
 # Application configuration defaults.
 #################################################################
@@ -250,6 +231,15 @@ config:
     sdnrdbTrustAllCerts: true
     mountpointRegistrarEnabled: false
     mountpointStateProviderEnabled: false
+    # enable and set dmaap-proxy for mountpointRegistrar
+    dmaapProxy:
+      enabled: false
+      usepwd: true
+      user: addUserHere
+      password: addPasswordHere
+      url: addProxyUrlHere
+
+