From 9cb9df98b6262d38280970db77718956bb0abefd Mon Sep 17 00:00:00 2001 From: James Hammett Date: Thu, 11 Jan 2024 05:19:42 -0700 Subject: [PATCH] add ES_PRESET environment variable (#98) Co-authored-by: Tim Campbell --- templates/configmap-env.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml index 51fc9da..3ce6ced 100644 --- a/templates/configmap-env.yaml +++ b/templates/configmap-env.yaml @@ -34,6 +34,7 @@ data: DEFAULT_LOCALE: {{ .Values.mastodon.locale }} {{- if .Values.elasticsearch.enabled }} ES_ENABLED: "true" + ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }} ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl ES_PORT: "9200" {{- else if .Values.elasticsearch.hostname }} @@ -44,6 +45,9 @@ data: {{- with .Values.elasticsearch.user }} ES_USER: {{ . }} {{- end }} + {{- with .Values.elasticsearch.user }} + ES_USER: {{ . }} + {{- end }} LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }} {{- with .Values.mastodon.web_domain }} WEB_DOMAIN: {{ . }}