From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 29 Oct 2019 11:00:36 +0000 (+0100)
Subject: [Portal] Adjust Pods Requests/Limits
X-Git-Tag: 6.0.0~542^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=22b89c7ae1e0f71e227cf549b9c77af750d2c414;p=oom.git

[Portal] Adjust Pods Requests/Limits

I've adjusted the Requests / Limits of portal pods according to real
usage of "Orange Openlab" and "Onap daily master".

Calculation is the following:

per deployment:
 * CPU/Mem requests is max of average from the two deployments
 * CPU/Mem limits is (max of max from the two deployments) * 1.2

 Moved portal-widget CPU limit to 1 as it's not starting if set to lower
 than that.

 Full values are available on jira ticket
 (https://jira.onap.org/browse/PORTAL-517).

Change-Id: Ic02fef386e05351a6fa9e47bf47d5c2046f490e3
Issue-ID: PORTAL-517
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Signed-off-by: Lorraine Welch <lb2391@att.com>
---

diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 8d9cee0d4e..a0c3d360c9 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -95,11 +95,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 10Gi
+      cpu: 2.2
+      memory: 800Mi
     requests:
-      cpu: 1
-      memory: 6Gi
+      cpu: 30m
+      memory: 460Mi
   large:
     limits:
       cpu: 4
diff --git a/kubernetes/portal/charts/portal-cassandra/values.yaml b/kubernetes/portal/charts/portal-cassandra/values.yaml
index e08f59b971..65fcdbe84a 100644
--- a/kubernetes/portal/charts/portal-cassandra/values.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/values.yaml
@@ -98,11 +98,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: 500m
+      memory: 3.75Gi
     requests:
-      cpu: 1
-      memory: 4Gi
+      cpu: 160m
+      memory: 2.8Gi
   large:
     limits:
       cpu: 4
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index e6896f17c1..e6aab2a2e3 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -132,11 +132,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 800m
-      memory: 1Gi
+      cpu: 460m
+      memory: 175Mi
     requests:
-      cpu: 400m
-      memory: 500Mi
+      cpu: 10m
+      memory: 100Mi
   large:
     limits:
       cpu: 2
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 4a0124d7a5..8daa14831f 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -89,11 +89,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 4
-      memory: 10Gi
+      cpu: 600m
+      memory: 1.6Gi
     requests:
-      cpu: 2
-      memory: 5Gi
+      cpu: 10m
+      memory: 1.3Gi
   large:
     limits:
       cpu: 8
diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 37f4294fb4..7a02509737 100644
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -75,10 +75,10 @@ resources:
   small:
     limits:
       cpu: 1
-      memory: 4Gi
+      memory: 430Mi
     requests:
-      cpu: 500m
-      memory: 2Gi
+      cpu: 1m
+      memory: 360Mi
   large:
     limits:
       cpu: 2
diff --git a/kubernetes/portal/charts/portal-zookeeper/values.yaml b/kubernetes/portal/charts/portal-zookeeper/values.yaml
index c7c8030339..6037d246cf 100644
--- a/kubernetes/portal/charts/portal-zookeeper/values.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/values.yaml
@@ -62,11 +62,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 600Mi
+      cpu: 100m
+      memory: 200Mi
     requests:
-      cpu: 250m
-      memory: 300Mi
+      cpu: 1m
+      memory: 80Mi
   large:
     limits:
       cpu: 1