Merge "[COMMON][MARIADB] Upgrade Mariadb DB galera version"

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

diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml
index 1ead35e..5510b3a 100644 (file)
--- a/kubernetes/cds/values.yaml
+++ b/kubernetes/cds/values.yaml
@@ -20,11 +20,6 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-  repository: nexus3.onap.org:10001
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.2
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   persistence:
     mountPath: /dockerdata-nfs
 
@@ -35,20 +30,14 @@ secrets:
   - name: &dbUserSecretName '{{ include "common.release" . }}-cds-db-secret'
     uid: 'cds-db-secret'
     type: basicAuth
-    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret")) .) (hasSuffix "cds-db-secret" (index .Values "mariadb-galera" "config" "userCredentialsExternalSecret"))}}'
-    login: '{{ index .Values "mariadb-galera" "config" "userName" }}'
-    password: '{{ index .Values "mariadb-galera" "config" "userPassword" }}'
-  - name: &dbRootPasswordSecretName '{{ include "common.release" . }}-cds-db-root-pass'
-    uid: 'cds-db-root-pass'
-    type: password
-    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret")) .) (hasSuffix "cds-db-root-pass" (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret"))}}'
-    password: '{{ index .Values "mariadb-galera" "config" "mariadbRootPassword" }}'
+    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "db" "externalSecret")) .) (hasSuffix "cds-db-secret" (index .Values "mariadb-galera" "db" "externalSecret"))}}'
+    login: '{{ index .Values "mariadb-galera" "db" "user" }}'
+    password: '{{ index .Values "mariadb-galera" "db" "password" }}'
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application images
-repository: nexus3.onap.org:10001
 pullPolicy: Always
 
 
@@ -82,29 +71,40 @@ ingress:
   enabled: false
 
 mariadb-galera:
-  config:
-    userName: sdnctl
-    # userPassword: sdnctl
-    userCredentialsExternalSecret: *dbUserSecretName
-    mariadbRootPasswordExternalSecret: *dbRootPasswordSecretName
-    mysqlDatabase: &mysqlDbName sdnctl
+  db:
+    user: sdnctl
+    # password:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName sdnctl
   nameOverride: &dbServer cds-db
-  service:
-    name: cds-db
-    portName: cds-db
   replicaCount: 1
   persistence:
     enabled: true
     mountSubPath: cds/data
+  serviceAccount:
+    nameOverride: *dbServer
 
 cds-blueprints-processor:
+  enabled: true
   config:
     cdsDB:
       dbServer: *dbServer
       dbPort: 3306
       dbName: *mysqlDbName
       dbCredsExternalSecret: *dbUserSecretName
-      dbRootPassExternalSecret: *dbRootPasswordSecretName
+
+cds-command-executor:
+  enabled: true
+
+cds-py-executor:
+  enabled: true
+
+cds-sdc-listener:
+  enabled: true
+
+cds-ui:
+  enabled: true
+
 
 #Resource Limit flavor -By Default using small
 flavor: small