From a9d03f929f0a711494e284d69da5ec260302ab27 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 18 Jan 2021 17:18:30 +0000 Subject: [PATCH] Allow custom memory overwrites for ES cluster --- charts/kubezero-logging/templates/eck/elasticsearch.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kubezero-logging/templates/eck/elasticsearch.yaml b/charts/kubezero-logging/templates/eck/elasticsearch.yaml index 57a0a13..bc83c1d 100644 --- a/charts/kubezero-logging/templates/eck/elasticsearch.yaml +++ b/charts/kubezero-logging/templates/eck/elasticsearch.yaml @@ -54,12 +54,12 @@ spec: resources: requests: cpu: {{ default "200m" .cpu_request }} - memory: {{ mul 2 ( default "2" .jvm_heap ) }}Gi + memory: {{ default ( mul 2 ( default "2" .jvm_heap ) ) .memory_request }}Gi limits: {{- if .cpu_limit }} cpu: {{ .cpu_limit }} {{- end }} - memory: {{ mul 2 ( default "2" .jvm_heap ) }}Gi + memory: {{ default ( mul 2 ( default "2" .jvm_heap ) ) .memory_limit }}Gi env: - name: ES_JAVA_OPTS value: -Xms{{ default "2" .jvm_heap }}g -Xmx{{ default "2" .jvm_heap }}g