diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml index 3ce6ced..f2d989e 100644 --- a/templates/configmap-env.yaml +++ b/templates/configmap-env.yaml @@ -39,15 +39,13 @@ data: ES_PORT: "9200" {{- else if .Values.elasticsearch.hostname }} ES_ENABLED: "true" + ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }} ES_HOST: {{ include "mastodon.elasticsearch.fullHostname" .}} ES_PORT: {{ .Values.elasticsearch.port | default "9200" | quote }} {{- end }} {{- 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: {{ . }} diff --git a/values.yaml b/values.yaml index e606b8b..237ace5 100644 --- a/values.yaml +++ b/values.yaml @@ -338,6 +338,7 @@ elasticsearch: # hostname: # port: 9200 # tls: true + # preset: single_node_cluster # This is optional, use it if you ES cluster requires authentication # user: