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

Add TLS field for simplicity

Browse Source
This commit is contained in:
Tim Campbell 2023-12-13 11:01:39 +01:00
parent ce3591062f
commit 5470bc0611
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
templates/_helpers.tpl
View File

@ -161,3 +161,16 @@ Find highest number of needed database connections to set DB_POOL variable
{{- end }} {{- end }}
{{- $poolSize | quote }} {{- $poolSize | quote }}
{{- end }} {{- end }}
{{/*
Full hostname for a custom Elasticsearch cluster
*/}}
{{- define "mastodon.elasticsearch.fullHostname" -}}
{{- if not .Values.elasticsearch.enabled }}
{{- if .Values.elasticsearch.tls }}
{{- printf "https://%s" (tpl .Values.elasticsearch.hostname $) -}}
{{- else -}}
{{- printf "%s" (tpl .Values.elasticsearch.hostname $) -}}
{{- end }}
{{- end -}}
{{- end -}}

2
templates/configmap-env.yaml
View File

@ -23,7 +23,7 @@ data:
ES_PORT: "9200" ES_PORT: "9200"
{{- else if .Values.elasticsearch.hostname }} {{- else if .Values.elasticsearch.hostname }}
ES_ENABLED: "true" ES_ENABLED: "true"
ES_HOST: {{ .Values.elasticsearch.hostname }} 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 }}

5
values.yaml
View File

@ -259,10 +259,11 @@ elasticsearch:
image: image:
tag: 7 tag: 7
# If you are using an external ES cluster, use `enabled: false` and set the hostname and port. # If you are using an external ES cluster, use `enabled: false` and set the hostname, port,
# When using a cluster with TLS enabled, the hostname must begin with https:// # and whether the cluster uses TLS.
# hostname: # hostname:
# port: 9200 # port: 9200
# tls: true
# This is optional, use it if you ES cluster requires authentication # This is optional, use it if you ES cluster requires authentication
# user: # user: