X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=5a4d204c58c4e1b9ebae1b2f49f25bb91d8fa303;hb=12d6c4037b79a8d1a301d0e7b72b6532224730d0;hp=edac61b24eb139ed98625616b8c527f7ca93365b;hpb=cbc703c708b0c4805e4280e04d88dd3dea5b6e95;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index edac61b24e..5a4d204c58 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,56 +30,41 @@ global:
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
-  # Enabling CMPv2
-  cmpv2Enabled: true
-  platform:
-    certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
-      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"
+  # Enabling CMPv2 with CertManager
+  CMPv2CertManagerIntegration: false
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 secrets:
   - uid: db-root-password
-    name: '{{ include "common.release" . }}-sdnc-db-root-password'
+    name: &rootDbSecret '{{ include "common.release" . }}-sdnc-db-root-password'
     type: password
+    # If we're using shared mariadb, we need to use the secret name (second
+    # part).
+    # If not, we do the same trick than for user db secret hat allows you
+    # override this secret using external one with the same field that is used
+    # to pass this to subchart.
     externalSecret: '{{ .Values.global.mariadbGalera.localCluster |
-      ternary (default (include "common.mariadb.secret.rootPassSecretName"
-      (dict "dot" . "chartName"
-      (index .Values "mariadb-galera" "nameOverride")))
-      (index .Values "mariadb-galera" "config"
-      "mariadbRootPasswordExternalSecret"))
-      (include "common.mariadb.secret.rootPassSecretName"
-      (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
-    password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword") }}'
+      ternary ((hasSuffix "sdnc-db-root-password" (index .Values "mariadb-galera" "rootUser" "externalSecret")) |
+                  ternary
+                    ""
+                    (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .))
+              (include "common.mariadb.secret.rootPassSecretName"
+                (dict "dot" .
+                      "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
+    password: '{{ (index .Values "mariadb-galera" "rootUser" "password") }}'
   - uid: db-secret
     name: &dbSecretName '{{ include "common.release" . }}-sdnc-db-secret'
     type: basicAuth
     # This is a nasty trick that allows you override this secret using external one
     # with the same field that is used to pass this to subchart
-    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret")) .) (hasSuffix "sdnc-db-secret" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret"))}}'
-    login: '{{ index .Values "mariadb-galera" "config" "userName" }}'
-    password: '{{ index .Values "mariadb-galera" "config" "userPassword" }}'
+    externalSecret: '{{ (hasSuffix "sdnc-db-secret" (index .Values "mariadb-galera" "db" "externalSecret")) |
+      ternary
+        ""
+        (tpl (default "" (index .Values "mariadb-galera" "db" "externalSecret")) .) }}'
+    login: '{{ index .Values "mariadb-galera" "db" "user" }}'
+    password: '{{ index .Values "mariadb-galera" "db" "password" }}'
   - uid: odl-creds
     name: &odlCredsSecretName '{{ include "common.release" . }}-sdnc-odl-creds'
     type: basicAuth
@@ -87,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 }}'
@@ -124,12 +118,30 @@ secrets:
     password: '{{ .Values.config.scaleoutPassword }}'
     passwordPolicy: required
 #################################################################
+# Certificates
+#################################################################
+certificates:
+  - mountPath:  /var/custom-certs
+    commonName: sdnc.simpledemo.onap.org
+    dnsNames:
+        - sdnc.simpledemo.onap.org
+    keystore:
+      outputType:
+        - jks
+      passwordSecretRef:
+        name: sdnc-cmpv2-keystore-password
+        key: password
+    issuer:
+      group: certmanager.onap.org
+      kind: CMPv2Issuer
+      name: cmpv2-issuer-onap
+#################################################################
 # Application configuration defaults.
 #################################################################
 # application images
 
 pullPolicy: Always
-image: onap/sdnc-image:2.0.4
+image: onap/sdnc-image:2.0.5
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -184,7 +196,7 @@ config:
     binDir: /opt/opendaylight/bin
     gcLogDir: /opt/opendaylight/data/log
     salConfigDir: /opt/opendaylight/system/org/opendaylight/controller/sal-clustering-config
-    salConfigVersion: 1.9.1
+    salConfigVersion: 1.10.4
     akka:
       seedNodeTimeout: 15s
       circuitBreaker:
@@ -219,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
+
+
 
 
 
@@ -244,19 +265,25 @@ certInitializer:
 network-name-gen:
   enabled: true
 mariadb-galera: &mariadbGalera
-  nameOverride: sdnc-db
+  nameOverride: &sdnc-db sdnc-db
   config: &mariadbGaleraConfig
-    rootPasswordExternalSecret: '{{ ternary (include "common.release" .)-sdnc-db-root-password "" .Values.global.mariadbGalera.localCluster }}'
-    userName: sdnctl
+    rootPasswordExternalSecret: *rootDbSecret
+    userName: &dbUser sdnctl
     userCredentialsExternalSecret: *dbSecretName
+  rootUser:
+    externalSecret: *rootDbSecret
+  db:
+    user: *dbUser
+    externalSecret: *dbSecretName
   service:
     name: sdnc-dbhost
-    internalPort: 3306
   sdnctlPrefix: sdnc
   persistence:
     mountSubPath: sdnc/mariadb-galera
     enabled: true
   replicaCount: 1
+  serviceAccount:
+    nameOverride: *sdnc-db
 
 cds:
   enabled: false
@@ -311,7 +338,11 @@ dgbuilder:
   config:
     db:
       dbName: *sdncDbName
-      rootPasswordExternalSecret: '{{ ternary (printf "%s-sdnc-db-root-password" (include "common.release" .)) (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" "mariadb-galera")) .Values.global.mariadbGalera.localCluster }}'
+      rootPasswordExternalSecret: '{{ .Values.global.mariadbGalera.localCluster |
+        ternary
+          (printf "%s-sdnc-db-root-password" (include "common.release" .))
+          (include "common.mariadb.secret.rootPassSecretName"
+            (dict "dot" . "chartName" "mariadb-galera")) }}'
       userCredentialsExternalSecret: *dbSecretName
     dbPodName: mariadb-galera
     dbServiceName: mariadb-galera
@@ -428,7 +459,10 @@ persistence:
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: sdnc/mdsal
-  mdsalPath: /opt/opendaylight/current/daexim
+  mdsalPath: /opt/opendaylight/mdsal
+  daeximPath: /opt/opendaylight/mdsal/daexim
+  journalPath: /opt/opendaylight/journal
+  snapshotsPath: /opt/opendaylight/snapshots
 
 certpersistence:
   enabled: true