From 98400a6887f1eb67fb131433bb28a69246800c4c Mon Sep 17 00:00:00 2001
From: James Smith <119005+jgsmith@users.noreply.github.com>
Date: Sat, 14 May 2022 04:03:44 -0400
Subject: [PATCH] Support STREAMING_API_BASE_URL in Helm Chart (#18408)

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.
---
 chart/templates/configmap-env.yaml | 5 ++++-
 chart/values.yaml                  | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml
index 5e0620998ac..aa242684ff0 100644
--- a/chart/templates/configmap-env.yaml
+++ b/chart/templates/configmap-env.yaml
@@ -83,6 +83,9 @@ data:
   SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }}
   {{- end }}
   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 }}
   OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }}
   OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }}
@@ -300,4 +303,4 @@ data:
   {{- if .Values.externalAuth.ldap.uid_conversion.replace }}
   LDAP_UID_CONVERSION_REPLACE: {{ .Values.externalAuth.ldap.uid_conversion.replace }}
   {{- end }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 57d0b7391e8..2cfa3484b47 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -83,6 +83,9 @@ mastodon:
     # the node running the pod, which is unrelated to the resources allocated to
     # the pod by k8s
     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:
     port: 3000