diff options
| author | Starfall <us@starfall.systems> | 2022-06-06 13:35:20 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-06-06 13:35:20 -0500 |
| commit | 78266a002b4735caaef07098ba66419fd71f47c1 (patch) | |
| tree | 4ba2bc330d5ed4b6a3a926ab9a03a89f56bc8843 /chart | |
| parent | e9b2e11520056d0ec822ac0862923d00c6a1289c (diff) | |
| parent | 434b08e95b1a440bf9ae563b72600d1590106260 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'chart')
| -rw-r--r-- | chart/templates/configmap-env.yaml | 5 | ||||
| -rw-r--r-- | chart/values.yaml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml index 5e0620998..aa242684f 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 ef105f625..2cfa3484b 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -8,7 +8,7 @@ image: # built from the most recent commit # # tag: latest - tag: v3.5.1 + tag: v3.5.2 # use `Always` when using `latest` tag pullPolicy: IfNotPresent @@ -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 |