X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmodeling%2Fcomponents%2Fmodeling-etsicatalog%2Fvalues.yaml;h=fc3067718a4bae8f6c6745f99246cd8d31ed6052;hb=4753743f0743a6b22f69e718c3cdb4ba8843cea6;hp=6c1cae268721a55e7b78c3a7590d3e0cde4f81b9;hpb=d92618a67e411c4e0568c7a71a7d7b3307a56807;p=oom.git

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 6c1cae2687..fc3067718a 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -22,12 +22,19 @@ global:
     mountPath: /dockerdata-nfs
 
   mariadbGalera:
-    #This flag allows Modeling to instantiate its own mariadb-galera cluster
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
+    #This flag allows SO to instantiate its own mariadb-galera cluster
+    #When changing it to "true", also set "globalCluster: false"
+    #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
+    globalCluster: true
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 
+  centralizedLoggingEnabled: true
+
 readinessCheck:
   wait_for:
     msb:
@@ -51,24 +58,34 @@ secrets:
 #################################################################
 
 mariadb-galera:
-  config: &mariadbConfig
-    userCredentialsExternalSecret: *dbSecretName
-    mysqlDatabase: etsicatalog
-  nameOverride: modeling-db
+  db:
+    user: &dbUser etsicatalog
+    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
+  replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbSecretName
+    mysqlDatabase: *mysqlDbName
   # nameOverride should be the same with common.name
-  nameOverride: modeling-etsicatalog
+  nameOverride: etsicatalog-db
+  serviceAccount:
+    nameOverride: etsicatalog-db
 
 #################################################################
 # Application configuration defaults.
@@ -77,27 +94,29 @@ config:
   #application configuration about  msb
   ssl_enabled: false
   msb_enabled: false
-  msbProtocol: https
+  msbProtocol: http
   msbServiceName: msb-iag
   msbPort: 443
-  sdcProtocol: https
+  msbPlainPort: 80
+  sdcProtocol: http
   sdcServiceName: sdc-be
   sdcPort: 8443
+  sdcPlainPort: 8080
   dmaap_enabled: false
-  dmaapProtocol: https
+  dmaapProtocol: http
   dmaapServiceName: message-router-external
   dmaapPort: 3905
 
   #application configuration user password about mariadb
   db:
-    userName: etsicatalog
+    userName: *dbUser
     # userPassword: password
     # userCredentialsExternalSecret: some-secret
 
 # application image
 flavor: small
 
-image: onap/modeling/etsicatalog:1.0.9
+image: onap/modeling/etsicatalog:1.0.14
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -149,7 +168,7 @@ persistence:
 service:
   type: ClusterIP
   name: modeling-etsicatalog
-  portName: modeling-etsicatalog
+  portName: http
   externalPort: 8806
   internalPort: 8806
 #  nodePort: 30806
@@ -161,16 +180,26 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "0.5Gi"
     requests:
-      cpu: 100m
-      memory: 250Mi
+      cpu: "100m"
+      memory: "0.2Gi"
   large:
     limits:
-      cpu: 400m
-      memory: 1000Mi
+      cpu: "400m"
+      memory: "1Gi"
     requests:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "0.5Gi"
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: modeling-etsicatalog
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap