From 447735b4bdc8821f866c329dc7406ec6d7c65111 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 20 Oct 2020 10:47:05 +0200
Subject: [PATCH] [COMMON] Add limits to Elasticsearch

Requests were set for Elasticsearch but not limits.
Add some limits and updating requests on real usage.

Issue-ID: REQ-362
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I8ccfa22dfafceb79fafb1c6f180c77d49cedb00d
---
 .../elasticsearch/components/master/values.yaml    | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index 23302335ea..b606c3ed6e 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 #################################################################
 # Global configuration defaults.
 #################################################################
@@ -41,7 +40,7 @@ name: master
 ##
 replicaCount: 3
 ## master acts as master only node, choose 'no' if no further data nodes are deployed)
-dedicatednode: "yes"
+dedicatednode: 'yes'
 ## dedicatednode: "no"
 image: bitnami/elasticsearch:7.6.1
 ## Specify a imagePullPolicy
@@ -102,12 +101,14 @@ resources:
   ## We usually recommend not to specify default resources and to leave this as a conscious
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube.
-  limits: {}
+  limits:
+    cpu: 25m
+    memory: 1Gi
   #   cpu: 100m
   #   memory: 128Mi
   requests:
-    cpu: 25m
-    memory: 256Mi
+    cpu: 5m
+    memory: 310Mi
 ## Elasticsearch master-eligible container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##
@@ -160,13 +161,13 @@ persistence:
 ## Service parameters for master-eligible node(s)
 ##
 service:
-  suffix: "service"
-  name: ""
+  suffix: 'service'
+  name: ''
   ## list of ports for "common.containerPorts"
   ## Elasticsearch transport port
   ports:
-  - name: http-transport
-    port: 9300
+    - name: http-transport
+      port: 9300
   ## master-eligible service type
   ##
   type: ClusterIP
@@ -192,10 +193,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   # name:
 
-
 ## Elasticsearch cluster name
 ##
 clusterName: elastic-cluster
-
-
-
-- 
2.16.6