Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-admin-cockpit / values.yaml

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2b05dbe..53d185c 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -26,12 +26,14 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
+  readinessImage: onap/oom/readiness:6.0.3
   envsubstImage: dibi/envsubst
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
@@ -67,6 +69,15 @@ repository: nexus3.onap.org:10001
 image: onap/so/so-admin-cockpit:1.9.0
 pullPolicy: Always
 
+# Local mariadb galera instance default name
+mariadb-galera:
+  nameOverride: so-mariadb-galera
+  service:
+    internalPort: 3306
+  mariadbOperator:
+    galera:
+      enabled: false
+
 db:
   userName: so_user
   userPassword: so_User123
@@ -110,18 +121,18 @@ flavor: small
 resources:
   small:
     requests:
-      memory: 1Gi
-      cpu: 0.25
+      cpu: "0.5"
+      memory: "1Gi"
     limits:
-      memory: 4Gi
-      cpu: 0.5
+      cpu: "1"
+      memory: "4Gi"
   large:
     requests:
-      memory: 2Gi
-      cpu: 0.5
+      cpu: "1"
+      memory: "2Gi"
     limits:
-      memory: 8Gi
-      cpu: 1
+      cpu: "2"
+      memory: "8Gi"
   unlimited: {}
 readinessProbe:
   port: 9091