CloudToys/REI-Fixed
1
0
Fork 0
Code

Support STREAMING_API_BASE_URL in Helm Chart (#18408)

Browse Source 
This adds a mastodon.streaming.base_url setting in the Helm chart values
file to allow setting the STREAMING_API_BASE_URL in the Mastodon environnment
config map.
This commit is contained in:
James Smith 2022-05-14 04:03:44 -04:00 committed by GitHub
parent 42c976fd65
commit 98400a6887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chart/templates/configmap-env.yaml
View File

@ -83,6 +83,9 @@ data:
SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }} SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }}
{{- end }} {{- end }}
STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }} STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}
{{- if .Values.mastodon.streaming.base_url }}
STREAMING_API_BASE_URL: {{ .Values.mastodon.streaming.base_url | quote }}
{{- end }}
{{- if .Values.externalAuth.oidc.enabled }} {{- if .Values.externalAuth.oidc.enabled }}
OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }} OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }}
OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }} OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }}
@ -300,4 +303,4 @@ data:
{{- if .Values.externalAuth.ldap.uid_conversion.replace }} {{- if .Values.externalAuth.ldap.uid_conversion.replace }}
LDAP_UID_CONVERSION_REPLACE: {{ .Values.externalAuth.ldap.uid_conversion.replace }} LDAP_UID_CONVERSION_REPLACE: {{ .Values.externalAuth.ldap.uid_conversion.replace }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
chart/values.yaml
View File

@ -83,6 +83,9 @@ mastodon:
# the node running the pod, which is unrelated to the resources allocated to # the node running the pod, which is unrelated to the resources allocated to
# the pod by k8s # the pod by k8s
workers: 1 workers: 1
# The base url for streaming can be set if the streaming API is deployed to
# a different domain/subdomain.
# base_url: wws://streaming.example.com
web: web:
port: 3000 port: 3000