Skip to content

Commit c0ddcff

Browse files
committed
🧑‍💻(tilt) load secret vars from new env file
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.
1 parent 15133f9 commit c0ddcff

5 files changed

Lines changed: 47 additions & 9 deletions

File tree

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ create-env-files: \
7373
env.d/development/crowdin \
7474
env.d/development/postgresql \
7575
env.d/development/kc_postgresql \
76-
env.d/development/summary
76+
env.d/development/summary \
77+
env.d/development/kube-secret
7778
.PHONY: create-env-files
7879

7980
bootstrap: ## Prepare Docker images for the project
@@ -265,6 +266,9 @@ env.d/development/kc_postgresql:
265266
env.d/development/summary:
266267
cp -n env.d/development/summary.dist env.d/development/summary
267268

269+
env.d/development/kube-secret:
270+
cp -n env.d/development/kube-secret.dist env.d/development/kube-secret
271+
268272
# -- Internationalization
269273

270274
env.d/development/crowdin:

bin/Tiltfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ docker_build(
9595
)
9696
clean_old_images('localhost:5001/meet-livekit')
9797

98+
load('ext://secret', 'secret_yaml_generic')
99+
k8s_yaml(secret_yaml_generic(
100+
name="secret-dev",
101+
from_env_file="../env.d/development/kube-secret"
102+
))
103+
98104
k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev} template .'))
99105

100106
k8s_resource('minio-bucket', resource_deps=['minio'])

env.d/development/kube-secret.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
WHISPERX_BASE_URL=https://configure-your-url.com
2+
WHISPERX_API_KEY=<key>
3+
LLM_BASE_URL=https://configure-your-url.com
4+
LLM_API_KEY=<key>

src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,24 @@ _summaryEnvVars: &summaryEnvVars
66
AWS_S3_ACCESS_KEY_ID: meet
77
AWS_S3_SECRET_ACCESS_KEY: password
88
AWS_S3_SECURE_ACCESS: False
9-
WHISPERX_API_KEY: your-secret-value
10-
WHISPERX_BASE_URL: https://configure-your-url.com
9+
WHISPERX_API_KEY:
10+
secretKeyRef:
11+
name: secret-dev
12+
key: WHISPERX_API_KEY
13+
WHISPERX_BASE_URL:
14+
secretKeyRef:
15+
name: secret-dev
16+
key: WHISPERX_BASE_URL
1117
WHISPERX_ASR_MODEL: large-v2
1218
WHISPERX_DEFAULT_LANGUAGE: fr
13-
LLM_BASE_URL: https://configure-your-url.com
14-
LLM_API_KEY: your-secret-value
19+
LLM_BASE_URL:
20+
secretKeyRef:
21+
name: secret-dev
22+
key: LLM_BASE_URL
23+
LLM_API_KEY:
24+
secretKeyRef:
25+
name: secret-dev
26+
key: LLM_API_KEY
1527
LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
1628
WEBHOOK_API_TOKEN: password
1729
WEBHOOK_URL: https://www.mock-impress.com/webhook/

src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,24 @@ _summaryEnvVars: &summaryEnvVars
66
AWS_S3_ACCESS_KEY_ID: meet
77
AWS_S3_SECRET_ACCESS_KEY: password
88
AWS_S3_SECURE_ACCESS: False
9-
WHISPERX_API_KEY: your-secret-value
10-
WHISPERX_BASE_URL: https://configure-your-url.com
9+
WHISPERX_API_KEY:
10+
secretKeyRef:
11+
name: secret-dev
12+
key: WHISPERX_API_KEY
13+
WHISPERX_BASE_URL:
14+
secretKeyRef:
15+
name: secret-dev
16+
key: WHISPERX_BASE_URL
1117
WHISPERX_ASR_MODEL: large-v2
1218
WHISPERX_DEFAULT_LANGUAGE: fr
13-
LLM_BASE_URL: https://configure-your-url.com
14-
LLM_API_KEY: your-secret-value
19+
LLM_BASE_URL:
20+
secretKeyRef:
21+
name: secret-dev
22+
key: LLM_BASE_URL
23+
LLM_API_KEY:
24+
secretKeyRef:
25+
name: secret-dev
26+
key: LLM_API_KEY
1527
LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
1628
WEBHOOK_API_TOKEN: password
1729
WEBHOOK_URL: https://www.mock-impress.com/webhook/

0 commit comments

Comments
 (0)