From 0d3bd2727ed438d95c649bc63392bf882b44e551 Mon Sep 17 00:00:00 2001 From: Florent Chehab Date: Fri, 27 Mar 2026 15:43:25 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB(tilt)=20load?= =?UTF-8?q?=20secret=20vars=20from=20new=20env=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid commiting secrets, I am introducing a new kube-secret env file that is loaded by tilt as a secret. Dev helm values are updated accordingly. --- Makefile | 6 +++++- bin/Tiltfile | 6 ++++++ env.d/development/kube-secret.dist | 4 ++++ .../env.d/dev-dinum/values.meet.yaml.gotmpl | 20 +++++++++++++++---- .../dev-keycloak/values.meet.yaml.gotmpl | 20 +++++++++++++++---- 5 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 env.d/development/kube-secret.dist diff --git a/Makefile b/Makefile index 6ea11382..b003f2de 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,8 @@ create-env-files: \ env.d/development/crowdin \ env.d/development/postgresql \ env.d/development/kc_postgresql \ - env.d/development/summary + env.d/development/summary \ + env.d/development/kube-secret .PHONY: create-env-files bootstrap: ## Prepare Docker images for the project @@ -265,6 +266,9 @@ env.d/development/kc_postgresql: env.d/development/summary: cp -n env.d/development/summary.dist env.d/development/summary +env.d/development/kube-secret: + cp -n env.d/development/kube-secret.dist env.d/development/kube-secret + # -- Internationalization env.d/development/crowdin: diff --git a/bin/Tiltfile b/bin/Tiltfile index 7ef4f7fb..b615066b 100644 --- a/bin/Tiltfile +++ b/bin/Tiltfile @@ -95,6 +95,12 @@ docker_build( ) clean_old_images('localhost:5001/meet-livekit') +load('ext://secret', 'secret_yaml_generic') +k8s_yaml(secret_yaml_generic( + name="secret-dev", + from_env_file="../env.d/development/kube-secret" +)) + k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev-keycloak} template .')) k8s_resource('minio-bucket', resource_deps=['minio']) diff --git a/env.d/development/kube-secret.dist b/env.d/development/kube-secret.dist new file mode 100644 index 00000000..320eba06 --- /dev/null +++ b/env.d/development/kube-secret.dist @@ -0,0 +1,4 @@ +WHISPERX_BASE_URL=https://configure-your-url.com +WHISPERX_API_KEY= +LLM_BASE_URL=https://configure-your-url.com +LLM_API_KEY= diff --git a/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl b/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl index 661f83f8..4db3e3dd 100644 --- a/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl @@ -6,12 +6,24 @@ _summaryEnvVars: &summaryEnvVars AWS_S3_ACCESS_KEY_ID: meet AWS_S3_SECRET_ACCESS_KEY: password AWS_S3_SECURE_ACCESS: False - WHISPERX_API_KEY: your-secret-value - WHISPERX_BASE_URL: https://configure-your-url.com + WHISPERX_API_KEY: + secretKeyRef: + name: secret-dev + key: WHISPERX_API_KEY + WHISPERX_BASE_URL: + secretKeyRef: + name: secret-dev + key: WHISPERX_BASE_URL WHISPERX_ASR_MODEL: large-v2 WHISPERX_DEFAULT_LANGUAGE: fr - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value + LLM_BASE_URL: + secretKeyRef: + name: secret-dev + key: LLM_BASE_URL + LLM_API_KEY: + secretKeyRef: + name: secret-dev + key: LLM_API_KEY LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct WEBHOOK_API_TOKEN: password WEBHOOK_URL: https://www.mock-impress.com/webhook/ diff --git a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl index 2facede6..8d5734fc 100644 --- a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl @@ -6,12 +6,24 @@ _summaryEnvVars: &summaryEnvVars AWS_S3_ACCESS_KEY_ID: meet AWS_S3_SECRET_ACCESS_KEY: password AWS_S3_SECURE_ACCESS: False - WHISPERX_API_KEY: your-secret-value - WHISPERX_BASE_URL: https://configure-your-url.com + WHISPERX_API_KEY: + secretKeyRef: + name: secret-dev + key: WHISPERX_API_KEY + WHISPERX_BASE_URL: + secretKeyRef: + name: secret-dev + key: WHISPERX_BASE_URL WHISPERX_ASR_MODEL: large-v2 WHISPERX_DEFAULT_LANGUAGE: fr - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value + LLM_BASE_URL: + secretKeyRef: + name: secret-dev + key: LLM_BASE_URL + LLM_API_KEY: + secretKeyRef: + name: secret-dev + key: LLM_API_KEY LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct WEBHOOK_API_TOKEN: password WEBHOOK_URL: https://www.mock-impress.com/webhook/