From 15133f9d6b8604f2cf9f1ce5bdf7aba437f4f275 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Wed, 25 Mar 2026 12:49:31 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB(helm)=20use?= =?UTF-8?q?=20YAML=20anchors=20to=20simplify=20Helm=20values=20for=20summa?= =?UTF-8?q?ry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce duplication by introducing YAML anchors for configurations shared across multiple services. Most settings were nearly identical across the three summary services, making them easier to maintain and update. --- .../env.d/dev-dinum/values.meet.yaml.gotmpl | 111 +++++------------ .../dev-keycloak/values.meet.yaml.gotmpl | 115 +++++------------- 2 files changed, 64 insertions(+), 162 deletions(-) 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 eaeb926d..661f83f8 100644 --- a/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev-dinum/values.meet.yaml.gotmpl @@ -1,3 +1,29 @@ +_summaryEnvVars: &summaryEnvVars + APP_NAME: summary-microservice + APP_API_TOKEN: password + AWS_STORAGE_BUCKET_NAME: meet-media-storage + AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000/ + 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_ASR_MODEL: large-v2 + WHISPERX_DEFAULT_LANGUAGE: fr + LLM_BASE_URL: https://configure-your-url.com + LLM_API_KEY: your-secret-value + LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct + WEBHOOK_API_TOKEN: password + WEBHOOK_URL: https://www.mock-impress.com/webhook/ + CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 + CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 + TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 + +_summaryImage: &summaryImage + repository: localhost:5001/meet-summary + pullPolicy: Always + tag: "latest" + image: repository: localhost:5001/meet-backend pullPolicy: Always @@ -142,66 +168,15 @@ posthog: summary: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000 - 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_ASR_MODEL: large-v2 - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - - command: - - "uvicorn" - - "summary.main:app" - - "--host" - - "0.0.0.0" - - "--port" - - "8000" - - "--reload" + <<: *summaryEnvVars celeryTranscribe: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000 - 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_ASR_MODEL: large-v2 - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - + <<: *summaryEnvVars command: - "celery" - "-A" @@ -213,31 +188,9 @@ celeryTranscribe: celerySummarize: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000 - 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_ASR_MODEL: large-v2 - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - + <<: *summaryEnvVars command: - "celery" - "-A" 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 ed514ebb..2facede6 100644 --- a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl @@ -1,3 +1,29 @@ +_summaryEnvVars: &summaryEnvVars + APP_NAME: summary-microservice + APP_API_TOKEN: password + AWS_STORAGE_BUCKET_NAME: meet-media-storage + AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000/ + 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_ASR_MODEL: large-v2 + WHISPERX_DEFAULT_LANGUAGE: fr + LLM_BASE_URL: https://configure-your-url.com + LLM_API_KEY: your-secret-value + LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct + WEBHOOK_API_TOKEN: password + WEBHOOK_URL: https://www.mock-impress.com/webhook/ + CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 + CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 + TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 + +_summaryImage: &summaryImage + repository: localhost:5001/meet-summary + pullPolicy: Always + tag: "latest" + image: repository: localhost:5001/meet-backend pullPolicy: Always @@ -160,69 +186,15 @@ posthog: summary: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000/ - 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_ASR_MODEL: large-v2 - WHISPERX_DEFAULT_LANGUAGE: fr - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - - command: - - "uvicorn" - - "summary.main:app" - - "--host" - - "0.0.0.0" - - "--port" - - "8000" - - "--reload" + <<: *summaryEnvVars celeryTranscribe: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000/ - 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_ASR_MODEL: large-v2 - WHISPERX_DEFAULT_LANGUAGE: fr - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - + <<: *summaryEnvVars command: - "celery" - "-A" @@ -235,32 +207,9 @@ celeryTranscribe: celerySummarize: replicas: 1 + image: *summaryImage envVars: - APP_NAME: summary-microservice - APP_API_TOKEN: password - AWS_STORAGE_BUCKET_NAME: meet-media-storage - AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000/ - 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_ASR_MODEL: large-v2 - WHISPERX_DEFAULT_LANGUAGE: fr - LLM_BASE_URL: https://configure-your-url.com - LLM_API_KEY: your-secret-value - LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct - WEBHOOK_API_TOKEN: password - WEBHOOK_URL: https://www.mock-impress.com/webhook/ - CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1 - CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1 - TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1 - - image: - repository: localhost:5001/meet-summary - pullPolicy: Always - tag: "latest" - + <<: *summaryEnvVars command: - "celery" - "-A"