Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[oom.git] / kubernetes / modeling / components / modeling-etsicatalog / values.yaml

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 6c1cae2..61df057 100644 (file)
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -28,6 +28,8 @@ global:
     internalPort: 3306
     nameOverride: mariadb-galera
 
+  centralizedLoggingEnabled: true
+
 readinessCheck:
   wait_for:
     msb:
@@ -51,22 +53,25 @@ secrets:
 #################################################################
 
 mariadb-galera:
-  config: &mariadbConfig
-    userCredentialsExternalSecret: *dbSecretName
-    mysqlDatabase: etsicatalog
-  nameOverride: modeling-db
+  db:
+    externalSecret: *dbSecretName
+    name: &mysqlDbName etsicatalog
+  nameOverride: &modeling-db modeling-db
   service:
-    name: modeling-db
-    portName: modeling-db
+    name: *modeling-db
     internalPort: 3306
   nfsprovisionerPrefix: modeling
   persistence:
     mountSubPath: modeling/data
     enabled: true
   disableNfsProvisioner: true
+  serviceAccount:
+    nameOverride: *modeling-db
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbSecretName
+    mysqlDatabase: *mysqlDbName
   # nameOverride should be the same with common.name
   nameOverride: modeling-etsicatalog
 
@@ -97,7 +102,7 @@ config:
 # application image
 flavor: small
 
-image: onap/modeling/etsicatalog:1.0.9
+image: onap/modeling/etsicatalog:1.0.14
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -174,3 +179,13 @@ resources:
       cpu: 200m
       memory: 500Mi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: modeling-etsicatalog
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap