Merge "[DMAAP] DMaaP ServiceMesh compatibility"

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

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 2a760cd..0e6c9d6 100644 (file)
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -22,6 +22,8 @@ global:
   # application's front end hostname.  Must be resolvable on the client side environment
   portalHostName: "portal.api.simpledemo.onap.org"
 
+  centralizedLoggingEnabled: true
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -32,12 +34,19 @@ secrets:
     externalSecret: '{{ tpl (default "" .Values.config.casandraCredsExternalSecret) . }}'
     login: '{{ .Values.config.cassandraUsername }}'
     password: '{{ .Values.config.cassandraPassword }}'
+  - uid: portal-backend-db
+    name: &backendDbSecretName '{{ include "common.release" . }}-portal-backend-creds'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.mariadb.config.backendDbExternalSecret) . }}'
+    login: '{{ .Values.mariadb.config.backendUserName }}'
+    password: '{{ .Values.mariadb.config.backendPassword }}'
+    passwordPolicy: required
 
 config:
   logstashServiceName: log-ls
   logstashPort: 5044
   cassandraUsername: root
-# cassandraPassword: Aa123456
+  cassandraPassword: Aa123456
 # casandraCredsExternalSecret: some secret
 
 portal-mariadb:
@@ -45,6 +54,11 @@ portal-mariadb:
 mariadb:
   service:
     name: portal-db
+  config:
+#   backendDbExternalSecret: some secret
+    backendUserName: portal
+    backendPassword: portal
+
 widget:
   service:
     name: portal-widget
@@ -54,13 +68,21 @@ cassandra:
   config:
     cassandraExternalSecret: *dbSecretName
 portal-app:
+  mariadb:
+    config:
+      backendDbExternalSecret: *backendDbSecretName
   cassandra:
     config:
       cassandraExternalSecret: *dbSecretName
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-portal'
 portal-sdk:
+  mariadb:
+    config:
+      backendDbExternalSecret: *backendDbSecretName
   cassandra:
     config:
       cassandraExternalSecret: *dbSecretName
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-portal'
 messageRouter:
   service:
     name: message-router