From 45fba7670be417634d3b85ae0a15cc84acbbe324 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 23 Nov 2018 11:35:46 +0100
Subject: Use flavors for resources in clamp deployment

For Casablanca release, flavors have been set up for choosing the
"right" resource requests and limits.

Although the deployment is using the right way for that, clamp-xxx
charts values.yaml was not.

This commit makes values.yaml aligned with flavors

Change-Id: I025965d3d7820345f8459a5c5821091a29b2c5c7
Issue-ID: CLAMP-250
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---
 kubernetes/clamp/charts/clamp-dash-es/values.yaml  | 22 +++++++++++++++------
 .../clamp/charts/clamp-dash-kibana/values.yaml     | 23 +++++++++++++++-------
 .../clamp/charts/clamp-dash-logstash/values.yaml   | 22 +++++++++++++++------
 kubernetes/clamp/charts/mariadb/values.yaml        | 22 +++++++++++++++------
 4 files changed, 64 insertions(+), 25 deletions(-)

(limited to 'kubernetes/clamp/charts')

diff --git a/kubernetes/clamp/charts/clamp-dash-es/values.yaml b/kubernetes/clamp/charts/clamp-dash-es/values.yaml
index 98ce044d03..43920b3d65 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/values.yaml
@@ -20,6 +20,7 @@ global:
   nodePortPrefix: 302
   repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   persistence: {}
+flavor: small
 
 #################################################################
 # Application configuration defaults.
@@ -108,9 +109,18 @@ ingress:
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
-  limits:
-    cpu: 1
-    memory: 4Gi
-  requests:
-    cpu: 10m
-    memory: 2.5Gi
+  small:
+    limits:
+      cpu: 1
+      memory: 4Gi
+    requests:
+      cpu: 10m
+      memory: 2.5Gi
+  large:
+    limits:
+      cpu: 1
+      memory: 4Gi
+    requests:
+      cpu: 10m
+      memory: 2.5Gi
+  unlimited: {}
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
index 9cc1b2f82f..b60dbcff38 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -22,6 +22,7 @@ global:
   readinessRepository: oomk8s
   readinessImage: readiness-check:1.1.0
   persistence: {}
+flavor: small
 
 #################################################################
 # Application configuration defaults.
@@ -88,10 +89,18 @@ ingress:
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
-  limits:
-    cpu: 1
-    memory: 2Gi
-  requests:
-    cpu: 10m
-    memory: 750Mi
-
+  small:
+    limits:
+      cpu: 1
+      memory: 2Gi
+    requests:
+      cpu: 10m
+      memory: 750Mi
+  large:
+    limits:
+      cpu: 1
+      memory: 2Gi
+    requests:
+      cpu: 10m
+      memory: 750Mi
+  unlimited: {}
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
index 06a5d0bca3..ba8f46bdac 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
@@ -22,6 +22,7 @@ global:
   readinessRepository: oomk8s
   readinessImage: readiness-check:1.1.0
   persistence: {}
+flavor: small
 
 #################################################################
 # Application configuration defaults.
@@ -91,9 +92,18 @@ ingress:
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
-  limits:
-    cpu: 1
-    memory: 1.3Gi
-  requests:
-    cpu: 10m
-    memory: 750Mi
+  small:
+    limits:
+      cpu: 1
+      memory: 1.3Gi
+    requests:
+      cpu: 10m
+      memory: 750Mi
+  large:
+    limits:
+      cpu: 1
+      memory: 1.3Gi
+    requests:
+      cpu: 10m
+      memory: 750Mi
+  unlimited: {}
diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml
index a419f11b3a..13d1971028 100644
--- a/kubernetes/clamp/charts/mariadb/values.yaml
+++ b/kubernetes/clamp/charts/mariadb/values.yaml
@@ -25,6 +25,7 @@ global: # global defaults
 repository: nexus3.onap.org:10001
 image: mariadb:10.1.11
 pullPolicy: Always
+flavor: small
 
 #################################################################
 # Application configuration defaults.
@@ -98,9 +99,18 @@ ingress:
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
-  limits:
-    cpu: 1
-    memory: 500Mi
-  requests:
-    cpu: 10m
-    memory: 200Mi
+  small:
+    limits:
+      cpu: 1
+      memory: 500Mi
+    requests:
+      cpu: 10m
+      memory: 200Mi
+  large:
+    limits:
+      cpu: 1
+      memory: 500Mi
+    requests:
+      cpu: 10m
+      memory: 200Mi
+  unlimited: {}
-- 
cgit 1.2.3-korg