infra/mastodon-chart-mirror
3
0
Fork 0
mirror of https://github.com/mastodon/chart synced 2025-05-18 04:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick rearrange for ES_PRESET, add to values file

Browse Source
This commit is contained in:
Tim Campbell 2024-01-11 13:33:14 +01:00
parent 9cb9df98b6
commit 2b5dd1ac75
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/configmap-env.yaml
View File

@ -34,20 +34,17 @@ data:
DEFAULT_LOCALE: {{ .Values.mastodon.locale }} DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
{{- if .Values.elasticsearch.enabled }} {{- if .Values.elasticsearch.enabled }}
ES_ENABLED: "true" ES_ENABLED: "true"
ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }}
ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl
ES_PORT: "9200" ES_PORT: "9200"
{{- else if .Values.elasticsearch.hostname }} {{- else if .Values.elasticsearch.hostname }}
ES_ENABLED: "true" ES_ENABLED: "true"
ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }}
ES_HOST: {{ include "mastodon.elasticsearch.fullHostname" .}} ES_HOST: {{ include "mastodon.elasticsearch.fullHostname" .}}
ES_PORT: {{ .Values.elasticsearch.port | default "9200" | quote }} ES_PORT: {{ .Values.elasticsearch.port | default "9200" | quote }}
{{- end }} {{- end }}
{{- with .Values.elasticsearch.user }} {{- with .Values.elasticsearch.user }}
ES_USER: {{ . }} ES_USER: {{ . }}
{{- end }} {{- end }}
{{- with .Values.elasticsearch.user }}
ES_USER: {{ . }}
{{- end }}
LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }} LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
{{- with .Values.mastodon.web_domain }} {{- with .Values.mastodon.web_domain }}
WEB_DOMAIN: {{ . }} WEB_DOMAIN: {{ . }}

1
values.yaml
View File

@ -334,6 +334,7 @@ elasticsearch:
# hostname: # hostname:
# port: 9200 # port: 9200
# tls: true # tls: true
# preset: single_node_cluster
# This is optional, use it if you ES cluster requires authentication # This is optional, use it if you ES cluster requires authentication
# user: # user: