Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(helm): pass app-proxy refresh, livekit url and admin api url

Hampus2dde2339081e
diff --git a/deploy/helm/fluxer/templates/_config.tpl b/deploy/helm/fluxer/templates/_config.tpl
index 152b826a0..c98be12a6 100644
--- a/deploy/helm/fluxer/templates/_config.tpl
+++ b/deploy/helm/fluxer/templates/_config.tpl
@@ -93,9 +93,13 @@
{{- $c := dict }}
{{- $_ := set $c "FLUXER_APP_PROXY_PORT" "8080" }}
{{- $_ := set $c "DISCOVERY_UPSTREAM_URL" "http://api:8080/.well-known/fluxer" }}
+{{- $_ := set $c "DISCOVERY_REFRESH_INTERVAL_MS" "5000" }}
{{- $_ := set $c "FLUXER_S3_PUBLIC_ENDPOINT" ($v.s3.publicEndpoint | default $s3) }}
{{- $_ := set $c "FLUXER_S3_BUCKET_UPLOADS" $v.s3.buckets.uploads }}
{{- $_ := set $c "FLUXER_MEDIA_ENDPOINT" (printf "%s/media" (include "fluxer.origin" .)) }}
+{{- if eq (include "fluxer.livekitMode" .) "external" }}
+{{- $_ := set $c "FLUXER_LIVEKIT_URL" $v.livekit.external.publicUrl }}
+{{- end }}
{{- range $k, $val := $v.appProxy.config | default dict }}
{{- $_ := set $c $k (include "fluxer.string" ($val | default "")) }}
{{- end }}
diff --git a/deploy/helm/fluxer/templates/apps.yaml b/deploy/helm/fluxer/templates/apps.yaml
index 12f790d94..0662b758e 100644
--- a/deploy/helm/fluxer/templates/apps.yaml
+++ b/deploy/helm/fluxer/templates/apps.yaml
@@ -78,7 +78,7 @@ spec:
"probes" (dict "startup" (merge (deepCopy $pushCheck) (dict "periodSeconds" 10 "timeoutSeconds" 5 "failureThreshold" 12)) "liveness" (merge (deepCopy $pushCheck) $check) "readiness" (merge (deepCopy $pushCheck) $check))) }}
{{- include "fluxer.app" (dict "root" . "name" "admin" "component" "admin" "w" $v.admin "image" "fluxer-admin" "port" 8080
- "env" (list (dict "name" "FLUXER_ADMIN_PORT" "value" "8080") (dict "name" "FLUXER_ADMIN_BASE_PATH" "value" $v.adminBasePath) (dict "name" "FLUXER_API_ENDPOINT" "value" "http://api:8080") (dict "name" "FLUXER_STATIC_CDN_ENDPOINT" "value" $o))
+ "env" (list (dict "name" "FLUXER_ADMIN_PORT" "value" "8080") (dict "name" "FLUXER_ADMIN_BASE_PATH" "value" $v.adminBasePath) (dict "name" "FLUXER_API_ENDPOINT" "value" "http://api:8080") (dict "name" "FLUXER_API_PUBLIC_ENDPOINT" "value" (include "fluxer.string" (index ($v.env | default dict) "FLUXER_API_ENDPOINT" | default ""))) (dict "name" "FLUXER_STATIC_CDN_ENDPOINT" "value" $o))
"probes" $healthProbes) }}
{{- $ready := merge (dict "path" "/_ready") $http }}