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

[6.8] ES Statefulset empty initContainers fix (#795) #941

Merged
merged 1 commit into from
Nov 26, 2020
Merged

[6.8] ES Statefulset empty initContainers fix (#795) #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -153,6 +153,7 @@ spec:
{{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }}
enableServiceLinks: {{ .Values.enableServiceLinks }}
{{- if or (.Values.extraInitContainers) (.Values.sysctlInitContainer.enabled) (.Values.keystore) }}
initContainers:
{{- if .Values.sysctlInitContainer.enabled }}
- name: configure-sysctl
Expand Down Expand Up @@ -210,6 +211,7 @@ spec:
{{ tpl .Values.extraInitContainers . | indent 6 }}
{{- else }}
{{ toYaml .Values.extraInitContainers | indent 6 }}
{{- end }}
{{- end }}
{{- end }}
containers:
Expand Down
5 changes: 1 addition & 4 deletions elasticsearch/tests/elasticsearch_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,7 @@ def test_sysctl_init_container_disabled():
enabled: false
"""
r = helm_template(config)
initContainers = r["statefulset"][uname]["spec"]["template"]["spec"][
"initContainers"
]
assert initContainers is None
assert "initContainers" not in r["statefulset"][uname]["spec"]["template"]["spec"]


def test_sysctl_init_container_enabled():
Expand Down