X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=328b5adffbddaf61a6c18d5d983dc7bf12946d80;hb=2c1ba293ccef7dcaf09c46f5b0a8a36245238389;hp=e35dfde5936a7ba0f6f5ab014be79645c327554c;hpb=c03c938fb9d9ffac940797574a11f95b95f262fc;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index e35dfde593..328b5adffb 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -24,12 +24,14 @@ global:
     mountPath: /dockerdata-nfs
   centralizedLoggingEnabled: true
   mariadbGalera:
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
     #This flag allows SO to instantiate its own mariadb-galera cluster
     #If shared instance is used, this chart assumes that DB already exists
     localCluster: false
-    service: mariadb-galera
+    service: &mariadbService mariadb-galera
     internalPort: 3306
-    nameOverride: mariadb-galera
+    nameOverride: &mariadbName mariadb-galera
 
 
 #################################################################
@@ -323,12 +325,12 @@ config:
     sdnrdbTrustAllCerts: true
     elasticsearch:
     ## for legacy eleasticsearch database
-    # enabled: &esdbenabled true
-      enabled: &esdbenabled false
+      enabled: &esdbenabled true
+      # enabled: &esdbenabled false
     mariadb:
       ## for legacy eleasticsearch database
-      # enabled: false
-      enabled: true
+      enabled: false
+      # enabled: true
       databaseName: sdnrdb
       user: sdnrdb
       externalSecret: *sdnrdbSecretName
@@ -416,6 +418,7 @@ mariadb-galera: &mariadbGalera
   rootUser:
     externalSecret: *rootDbSecret
   db:
+    name: *sdncDbName
     user: *dbUser
     externalSecret: *dbSecretName
   service:
@@ -425,6 +428,9 @@ mariadb-galera: &mariadbGalera
     mountSubPath: sdnc/mariadb-galera
     enabled: true
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   serviceAccount:
     nameOverride: *sdnc-db
 
@@ -485,8 +491,8 @@ dgbuilder:
           (include "common.mariadb.secret.rootPassSecretName"
             (dict "dot" . "chartName" "mariadb-galera")) }}'
       userCredentialsExternalSecret: *dbSecretName
-    dbPodName: mariadb-galera
-    dbServiceName: mariadb-galera
+    dbPodName: *mariadbName
+    dbServiceName: *mariadbService
     # This should be revisited and changed to plain text
     dgUserPassword: cc03e747a6afbbcbf8be7668acfebee5
   serviceAccount:
@@ -654,14 +660,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4.7Gi
     requests:
       cpu: 1
       memory: 4.7Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 9.4Gi
     requests:
       cpu: 2