Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / onap / resources / environments / minimal-onap.yaml

diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 7bfa258..5a628c8 100644 (file)
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -16,17 +16,15 @@
 # This override file is used to deploy a minimal configuration to
 # onboard and deploy a VNF.
 # It includes the following components:
-# A&AI, Cassandra, DMAAP Message Router, Portal, Robot, SDC, SDNC, SO, STRIMZI Kafka, VID
+# A&AI, Cassandra, DMAAP Message Router, Portal, Robot, SDC, SDNC, SO, STRIMZI Kafka
 #
 # Minimal resources are also reviewed for the various containers
 # A&AI: no override => to be fixed
 # DMAAP: no override
-# Portal: new values
 # Robot: new values
 # SO: no override
 # SDC:  new values
 # SDNC:  no override
-# VID: no override
 #
 # Replica are set to 1 (A&AI Cassandra)
 #
@@ -47,21 +45,11 @@ aai:
       replicas: 1
   aai-cassandra:
     replicaCount: 1
-aaf:
-  enabled: false
-appc:
-  enabled: false
 cassandra:
   enabled: true
   replicaCount: 1
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -72,14 +60,10 @@ dmaap:
   enabled: true
   message-router:
     enabled: true
-  dmaap-bc:
-    enabled: false
   dmaap-dr-prov:
     enabled: false
   dmaap-dr-node:
     enabled: false
-log:
-  enabled: false
 mariadb-galera:
   enabled: true
 msb:
@@ -92,49 +76,8 @@ oof:
   enabled: false
 policy:
   enabled: false
-pomba:
+portal-ng:
   enabled: false
-portal:
-  enabled: true
-  portal-cassandra:
-    config:
-      cassandraJvmOpts: "-Xmx512m -Xms256m"
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 1Gi
-  portal-app:
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 1Gi
-          resources:
-  portal-mariaddb:
-    resources:
-      small:
-        limits:
-          cpu: 800m
-          memory: 1Gi
-      requests:
-          cpu: 100m
-          memory: 500Mi
-  portal-widget:
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 500Mi
 robot:
   enabled: true
   config:
@@ -142,11 +85,11 @@ robot:
   resources:
     small:
       limits:
-        cpu: 1
-        memory: 2Gi
+        cpu: "1"
+        memory: "2Gi"
       requests:
-        cpu: 10m
-        memory: 100Mi
+        cpu: "10m"
+        memory: "100Mi"
 sdc:
   enabled: true
   sdc-be:
@@ -156,19 +99,17 @@ sdc:
     resources:
       small:
         limits:
-          cpu: 1
-          memory: 2Gi
+          cpu: "1"
+          memory: "2Gi"
         requests:
-          cpu: 10m
-          memory: 500Mi
+          cpu: "10m"
+          memory: "500Mi"
   sdc-cs:
     config:
       maxHeapSize: "512M"
       heapNewSize: "256M"
 sdnc:
   enabled: true
-sniro-emulator:
-  enabled: false
 so:
   enabled: true
   config:
@@ -190,8 +131,6 @@ strimzi:
     enabled: false
 uui:
   enabled: false
-vid:
-  enabled: true
 vfc:
   enabled: false
 vnfsdk: