X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmodeling%2Fcomponents%2Fmodeling-etsicatalog%2Fvalues.yaml;h=83cfde8a7bc717a757edd1cb6776a93e10042c0d;hb=refs%2Fheads%2Fmaster;hp=1b1bb387b94792eb1902f5714038811d6cd860f0;hpb=d719ef17926ee176461304123f3948a3c9e95845;p=oom.git

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 1b1bb387b9..83cfde8a7b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -22,8 +22,13 @@ 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
@@ -32,10 +37,8 @@ global:
 
 readinessCheck:
   wait_for:
-    msb:
-      name: msb
-      containers:
-          - msb-iag
+    services:
+      - msb-iag
 
 #################################################################
 # Secrets metaconfig
@@ -54,6 +57,7 @@ secrets:
 
 mariadb-galera:
   db:
+    user: &dbUser etsicatalog
     externalSecret: *dbSecretName
     name: &mysqlDbName etsicatalog
   nameOverride: &modeling-db modeling-db
@@ -67,13 +71,19 @@ mariadb-galera:
   disableNfsProvisioner: true
   serviceAccount:
     nameOverride: *modeling-db
+  replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
 
 mariadb-init:
   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.
@@ -82,27 +92,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.13
+image: onap/modeling/etsicatalog:1.0.14
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -154,7 +166,7 @@ persistence:
 service:
   type: ClusterIP
   name: modeling-etsicatalog
-  portName: modeling-etsicatalog
+  portName: http
   externalPort: 8806
   internalPort: 8806
 #  nodePort: 30806
@@ -166,18 +178,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "500Mi"
     requests:
-      cpu: 100m
-      memory: 250Mi
+      cpu: "100m"
+      memory: "200Mi"
   large:
     limits:
-      cpu: 400m
-      memory: 1000Mi
+      cpu: "400m"
+      memory: "1Gi"
     requests:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "500Mi"
   unlimited: {}
 
 #Pods Service Account