From 6083e2a02cca12809f23959c6f28e1980381d297 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:24:29 +0100
Subject: [PATCH] [elasticsearch] only configure ES_JAVA_OPTS when value is set
 (#1089)

---
 elasticsearch/templates/statefulset.yaml  | 2 ++
 elasticsearch/tests/elasticsearch_test.py | 1 -
 elasticsearch/values.yaml                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
index 5b106d675..f4bd7401f 100644
--- a/elasticsearch/templates/statefulset.yaml
+++ b/elasticsearch/templates/statefulset.yaml
@@ -310,8 +310,10 @@ spec:
             value: "{{ .Values.clusterName }}"
           - name: network.host
             value: "{{ .Values.networkHost }}"
+          {{- if .Values.esJavaOpts  }}
           - name: ES_JAVA_OPTS
             value: "{{ .Values.esJavaOpts }}"
+          {{- end }}
           {{- range $role, $enabled := .Values.roles }}
           - name: node.{{ $role }}
             value: "{{ $enabled }}"
diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
index 2fc4297af..e788b7847 100755
--- a/elasticsearch/tests/elasticsearch_test.py
+++ b/elasticsearch/tests/elasticsearch_test.py
@@ -41,7 +41,6 @@ def test_defaults():
         {"name": "discovery.zen.ping.unicast.hosts", "value": uname + "-headless"},
         {"name": "network.host", "value": "0.0.0.0"},
         {"name": "cluster.name", "value": clusterName},
-        {"name": "ES_JAVA_OPTS", "value": "-Xmx1g -Xms1g"},
         {"name": "node.master", "value": "true"},
         {"name": "node.data", "value": "true"},
         {"name": "node.ingest", "value": "true"},
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 5b4fe0243..260fd0105 100755
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -66,7 +66,7 @@ podAnnotations: {}
 # additionals labels
 labels: {}
 
-esJavaOpts: "-Xmx1g -Xms1g"
+esJavaOpts: "" # example: "-Xmx1g -Xms1g"
 
 resources:
   requests: