[SDNC] Move ODL persistent data to pvc

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

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index edac61b..0bd8abe 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -29,11 +29,13 @@ global:
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
+    service: mariadb-galera
   # Enabling CMPv2
   cmpv2Enabled: true
+  CMPv2CertManagerIntegration: false
   platform:
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
+      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/
@@ -60,25 +62,33 @@ global:
 #################################################################
 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
@@ -123,13 +133,36 @@ secrets:
     login: '{{ .Values.config.scaleoutUser }}'
     password: '{{ .Values.config.scaleoutPassword }}'
     passwordPolicy: required
+  - uid: keystore-password
+    type: password
+    password: secret
+    passwordPolicy: required
+#################################################################
+# Certificates
+#################################################################
+certificates:
+  - name:       onap-sdnc-certificate
+    secretName: onap-sdnc-certificate
+    commonName: sdnc.simpledemo.onap.org
+    dnsNames:
+        - sdnc.simpledemo.onap.org
+    p12Keystore:
+      create: true
+      passwordSecretRef:
+        name: keystore-password
+        key: password
+    jksKeystore:
+      create: true
+      passwordSecretRef:
+        name: keystore-password
+        key: password
 #################################################################
 # 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 +217,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:
@@ -244,19 +277,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 +350,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 +471,10 @@ persistence:
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: sdnc/mdsal
-  mdsalPath: /opt/opendaylight/current/daexim
+  mdsalPath: /opt/opendaylight/mdsal
+  daeximPath: /opt/opendaylight/daexim
+  journalPath: /opt/opendaylight/journal
+  snapshotsPath: /opt/opendaylight/snapshots
 
 certpersistence:
   enabled: true