X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=1f2157011320ee80125ae5e88364e9a0682e875c;hb=db8167bbf6923c8f316ebadd6cec1dd4891428a1;hp=f1a428fb337b7fd9aa14963992ab14cb029e4882;hpb=d804418c890dde93bff26125b8cf1a9fd7fc82d1;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index f1a428fb33..1f21570113 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -27,9 +27,9 @@ global:
     #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-primary
     internalPort: 3306
-    nameOverride: mariadb-galera
+    nameOverride: &mariadbName mariadb-galera
 
 
 #################################################################
@@ -177,6 +177,11 @@ secrets:
     type: basicAuth
     login: '{{ .Values.config.sdnr.vesCollector.username }}'
     password: '{{ .Values.config.sdnr.vesCollector.password }}'
+  - uid: sdnrdb-secret
+    name: &sdnrdbSecretName '{{ include "common.release" . }}-sdnc-sdnrdb-secret'
+    type: basicAuth
+    login: '{{ index .Values "config" "sdnr" "mariadb" "user" }}'
+    password: '{{ index .Values "config" "sdnr" "mariadb" "password" }}'
 #################################################################
 # Certificates
 #################################################################
@@ -316,6 +321,19 @@ config:
     # sdnronly: true starts sdnc container with odl and sdnrwt features only
     sdnronly: false
     sdnrdbTrustAllCerts: true
+    elasticsearch:
+    ## for legacy eleasticsearch database
+      enabled: &esdbenabled true
+      # enabled: &esdbenabled false
+    mariadb:
+      ## for legacy eleasticsearch database
+      enabled: false
+      # enabled: true
+      databaseName: sdnrdb
+      user: sdnrdb
+      externalSecret: *sdnrdbSecretName
+      asyncHandling: true
+      asyncPoolSize: 200
     kafka:
       enabled: false
       consumerGroupPrefix: &consumerGroupPrefix sdnr
@@ -389,8 +407,6 @@ kafkaUser: *kafkaUser
 # dependency / sub-chart configuration
 network-name-gen:
   enabled: true
-  serviceAccount:
-    nameOverride: sdnc-name-gen
 mariadb-galera: &mariadbGalera
   nameOverride: &sdnc-db sdnc-db
   config: &mariadbGaleraConfig
@@ -403,12 +419,15 @@ mariadb-galera: &mariadbGalera
     user: *dbUser
     externalSecret: *dbSecretName
   service:
-    name: sdnc-dbhost
+    name: sdnc-db
   sdnctlPrefix: sdnc
   persistence:
     mountSubPath: sdnc/mariadb-galera
     enabled: true
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   serviceAccount:
     nameOverride: *sdnc-db
 
@@ -469,8 +488,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:
@@ -497,6 +516,7 @@ dgbuilder:
 # local elasticsearch cluster
 localElasticCluster: true
 elasticsearch:
+  enabled: *esdbenabled
   nameOverride: &elasticSearchName sdnrdb
   name: sdnrdb-cluster
   service:
@@ -637,14 +657,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