Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

✨(helm) add envFrom support to chart

KusalPabasarabd2dfcae8015
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc8537de..35ca5c40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to
### Added
+- ✨(helm) import environment variables from Secrets and ConfigMaps
- 🔒(backend) throttle meeting link generation
- 🔒️(backend) add a daily cap on room creation
- 🔧(summary) add setting to control Sentry traces sampling rate
diff --git a/src/helm/meet/templates/agent_metadata_deployment.yaml b/src/helm/meet/templates/agent_metadata_deployment.yaml
index 9879369c..ae1c094e 100644
--- a/src/helm/meet/templates/agent_metadata_deployment.yaml
+++ b/src/helm/meet/templates/agent_metadata_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.agentMetadata.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/agent_subtitles_deployment.yaml b/src/helm/meet/templates/agent_subtitles_deployment.yaml
index f5ce24ea..01b7668f 100644
--- a/src/helm/meet/templates/agent_subtitles_deployment.yaml
+++ b/src/helm/meet/templates/agent_subtitles_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.agentSubtitles.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/backend_cronjob_list.yaml b/src/helm/meet/templates/backend_cronjob_list.yaml
index 42a5bda5..de590b70 100644
--- a/src/helm/meet/templates/backend_cronjob_list.yaml
+++ b/src/helm/meet/templates/backend_cronjob_list.yaml
@@ -41,6 +41,10 @@ items:
imagePullPolicy: {{ ($.Values.backend.image | default dict).pullPolicy | default $.Values.image.pullPolicy }}
args:
{{- toYaml .command | nindent 22 }}
+ {{- with $.Values.backend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 20 }}
+ {{- end }}
env:
{{- if $envVars}}
{{- $envVars | indent 22 }}
diff --git a/src/helm/meet/templates/backend_deployment.yaml b/src/helm/meet/templates/backend_deployment.yaml
index bb848ef4..a7335d36 100644
--- a/src/helm/meet/templates/backend_deployment.yaml
+++ b/src/helm/meet/templates/backend_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.backend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/backend_job_createsuperuser.yaml b/src/helm/meet/templates/backend_job_createsuperuser.yaml
index 8ff654df..10600aba 100644
--- a/src/helm/meet/templates/backend_job_createsuperuser.yaml
+++ b/src/helm/meet/templates/backend_job_createsuperuser.yaml
@@ -49,6 +49,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.backend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/backend_job_merge_duplicate_users.yaml b/src/helm/meet/templates/backend_job_merge_duplicate_users.yaml
index b3880022..70a03a43 100644
--- a/src/helm/meet/templates/backend_job_merge_duplicate_users.yaml
+++ b/src/helm/meet/templates/backend_job_merge_duplicate_users.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.backend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/backend_job_migrate.yaml b/src/helm/meet/templates/backend_job_migrate.yaml
index efc901b5..77d82807 100644
--- a/src/helm/meet/templates/backend_job_migrate.yaml
+++ b/src/helm/meet/templates/backend_job_migrate.yaml
@@ -49,6 +49,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.backend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/celery_backend_deployment.yaml b/src/helm/meet/templates/celery_backend_deployment.yaml
index 0d413646..7817b971 100644
--- a/src/helm/meet/templates/celery_backend_deployment.yaml
+++ b/src/helm/meet/templates/celery_backend_deployment.yaml
@@ -1,4 +1,5 @@
{{- $envVars := include "meet.env.transformDict" (mergeOverwrite (default dict .Values.backend.envVars) (default dict .Values.celeryBackend.envVars)) -}}
+{{- $envFrom := concat (default (list) .Values.backend.envFrom) (default (list) .Values.celeryBackend.envFrom) -}}
{{- $fullName := include "meet.celeryBackend.fullname" . -}}
{{- $component := "celery-backend" -}}
apiVersion: apps/v1
@@ -50,6 +51,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with $envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/celery_summarize_deployment.yaml b/src/helm/meet/templates/celery_summarize_deployment.yaml
index 744f338a..83cd5e8c 100644
--- a/src/helm/meet/templates/celery_summarize_deployment.yaml
+++ b/src/helm/meet/templates/celery_summarize_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.celerySummarize.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/celery_summary_backend_deployment.yaml b/src/helm/meet/templates/celery_summary_backend_deployment.yaml
index 574a80da..bed338d6 100644
--- a/src/helm/meet/templates/celery_summary_backend_deployment.yaml
+++ b/src/helm/meet/templates/celery_summary_backend_deployment.yaml
@@ -46,6 +46,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.celerySummaryBackend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/celery_transcribe_deployment.yaml b/src/helm/meet/templates/celery_transcribe_deployment.yaml
index 95353a14..3a6a42cb 100644
--- a/src/helm/meet/templates/celery_transcribe_deployment.yaml
+++ b/src/helm/meet/templates/celery_transcribe_deployment.yaml
@@ -1,4 +1,5 @@
{{- $sharedEnvVars := default (dict) .Values.celeryTranscribe.envVars -}}
+{{- $sharedEnvFrom := default (list) .Values.celeryTranscribe.envFrom -}}
{{- $component := "celery-transcribe" -}}
{{- range $idx, $instance := .Values.celeryTranscribe.instances }}
@@ -6,6 +7,8 @@
{{- $fullName := printf "%s-%s" (include "meet.celeryTranscribe.fullname" $) $instance.name }}
{{- $extraInstanceEnvVars := default (dict) $instance.extraEnvVars -}}
{{- $mergedInstanceEnvVars := merge $extraInstanceEnvVars $sharedEnvVars -}}
+{{- $extraInstanceEnvFrom := default (list) $instance.extraEnvFrom -}}
+{{- $envFrom := concat $sharedEnvFrom $extraInstanceEnvFrom -}}
{{- $fakeInstanceObjectForEnvHelper := dict "envVars" $mergedInstanceEnvVars -}}
{{- $envVars := include "meet.common.env" (list . $fakeInstanceObjectForEnvHelper) -}}
apiVersion: apps/v1
@@ -60,6 +63,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with $envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/frontend_deployment.yaml b/src/helm/meet/templates/frontend_deployment.yaml
index 003a4619..22bee983 100644
--- a/src/helm/meet/templates/frontend_deployment.yaml
+++ b/src/helm/meet/templates/frontend_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.frontend.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/templates/summary_deployment.yaml b/src/helm/meet/templates/summary_deployment.yaml
index 4b5b0a3a..d913b01d 100644
--- a/src/helm/meet/templates/summary_deployment.yaml
+++ b/src/helm/meet/templates/summary_deployment.yaml
@@ -50,6 +50,10 @@ spec:
args:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- with .Values.summary.envFrom }}
+ envFrom:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
env:
{{- if $envVars }}
{{- $envVars | indent 12 }}
diff --git a/src/helm/meet/values.yaml b/src/helm/meet/values.yaml
index 88a351be..1ad64b22 100644
--- a/src/helm/meet/values.yaml
+++ b/src/helm/meet/values.yaml
@@ -232,6 +232,9 @@ backend:
envVars:
<<: *commonEnvVars
+ ## @param backend.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param backend.podAnnotations Annotations to add to the backend Pod
podAnnotations: {}
@@ -433,6 +436,9 @@ frontend:
envVars:
<<: *commonEnvVars
+ ## @param frontend.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param frontend.podAnnotations Annotations to add to the frontend Pod
podAnnotations: {}
@@ -624,6 +630,9 @@ summary:
envVars:
<<: *commonEnvVars
+ ## @param summary.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param summary.podAnnotations Annotations to add to the summary Pod
podAnnotations: {}
@@ -751,6 +760,9 @@ celeryBackend:
envVars:
<<: *commonEnvVars
+ ## @param celeryBackend.envFrom Import additional environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param celeryBackend.podAnnotations Annotations to add to the celeryBackend Pod
podAnnotations: {}
@@ -863,6 +875,9 @@ celeryTranscribe:
envVars:
<<: *commonEnvVars
+ ## @param celeryTranscribe.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param celeryTranscribe.podAnnotations Annotations to add to the celeryTranscribe Pod
podAnnotations: {}
@@ -923,6 +938,7 @@ celeryTranscribe:
## @extra celeryTranscribe.instances[].name Unique name suffix for the instance (used in the Deployment name and pod labels)
## @extra celeryTranscribe.instances[].replicas Override the number of replicas for this specific instance
## @extra celeryTranscribe.instances[].extraEnvVars Additional environment variables for this specific instance (same structure as envVars)
+ ## @extra celeryTranscribe.instances[].extraEnvFrom Additional ConfigMap or Secret environment sources for this specific instance
## @extra celeryTranscribe.instances[].command Override the container command for this specific instance
## @extra celeryTranscribe.instances[].args Override the container args for this specific instance
## @extra celeryTranscribe.instances[].resources Override resource requirements for this specific instance
@@ -933,6 +949,7 @@ celeryTranscribe:
instances:
- name: default
extraEnvVars: {}
+ extraEnvFrom: []
## @section celerySummarize
@@ -990,6 +1007,9 @@ celerySummarize:
envVars:
<<: *commonEnvVars
+ ## @param celerySummarize.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param celerySummarize.podAnnotations Annotations to add to the celerySummarize Pod
podAnnotations: {}
@@ -1099,6 +1119,9 @@ celerySummaryBackend:
envVars:
<<: *commonEnvVars
+ ## @param celerySummaryBackend.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param celerySummaryBackend.podAnnotations Annotations to add to the celerySummaryBackend Pod
podAnnotations: {}
@@ -1206,6 +1229,9 @@ agentMetadata:
envVars:
<<: *commonEnvVars
+ ## @param agentMetadata.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param agentMetadata.podAnnotations Annotations to add to the agentMetadata Pod
podAnnotations: {}
@@ -1297,6 +1323,9 @@ agentSubtitles:
# are NOT supported by the LiveKit Deepgram plugin in streaming mode.
# Use language="multi" for automatic multilingual support (10 languages).
+ ## @param agentSubtitles.envFrom Import environment variables from ConfigMaps or Secrets
+ envFrom: []
+
## @param agentSubtitles.podAnnotations Annotations to add to the agentSubtitles Pod
podAnnotations: {}