Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[elasticsearch] only configure ES_JAVA_OPTS when value is set #1089

Merged
merged 2 commits into from
Mar 18, 2021
Merged

[elasticsearch] only configure ES_JAVA_OPTS when value is set #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8081003
[elasticsearch] only configure ES_JAVA_OPTS when value is set
jmlrt Mar 3, 2021
e5cc1ad
fix python test
jmlrt Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions elasticsearch/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ spec:
value: "{{ .Values.clusterName }}"
- name: network.host
value: "{{ .Values.networkHost }}"
{{- if .Values.esJavaOpts }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there is a test asserting the default ES_JAVA_OPTS option that will need updated https://devops-ci.elastic.co/job/elastic+helm-charts+pull-request+template-testing/1218/CHART=elasticsearch,label=docker&&virtual/console

- name: ES_JAVA_OPTS
value: "{{ .Values.esJavaOpts }}"
{{- end }}
{{- range $role, $enabled := .Values.roles }}
- name: node.{{ $role }}
value: "{{ $enabled }}"
Expand Down
1 change: 0 additions & 1 deletion elasticsearch/tests/elasticsearch_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def test_defaults():
{"name": "discovery.seed_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"},
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ podAnnotations: {}
# additionals labels
labels: {}

esJavaOpts: "-Xmx1g -Xms1g"
esJavaOpts: "" # example: "-Xmx1g -Xms1g"

resources:
requests:
Expand Down