From 0127240c198da0f72e8005a94277dc3468f38b5f Mon Sep 17 00:00:00 2001 From: Ryan Br Date: Wed, 16 Oct 2024 12:50:04 -0700 Subject: [PATCH] chore: expose file transfer env vars to self-hosted via helm (#14373) --- .../templates/deployment.yaml | 10 ++++++++++ charts/airbyte/templates/env-configmap.yaml | 4 +++- charts/helm-tests/tests/basic_template_test.go | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/charts/airbyte-workload-launcher/templates/deployment.yaml b/charts/airbyte-workload-launcher/templates/deployment.yaml index 03a7d3848bd..34906e1d03f 100644 --- a/charts/airbyte-workload-launcher/templates/deployment.yaml +++ b/charts/airbyte-workload-launcher/templates/deployment.yaml @@ -316,6 +316,16 @@ spec: configMapKeyRef: name: {{ .Release.Name }}-airbyte-env key: WORKLOAD_LAUNCHER_PARALLELISM + - name: FILE_TRANSFER_EPHEMERAL_STORAGE_LIMIT + valueFrom: + configMapKeyRef: + name: {{ .Release.Name }}-airbyte-env + key: FILE_TRANSFER_EPHEMERAL_STORAGE_LIMIT + - name: FILE_TRANSFER_EPHEMERAL_STORAGE_REQUEST + valueFrom: + configMapKeyRef: + name: {{ .Release.Name }}-airbyte-env + key: FILE_TRANSFER_EPHEMERAL_STORAGE_REQUEST {{- if or (eq .Values.global.edition "pro") (eq .Values.global.edition "enterprise") }} - name: AIRBYTE_API_AUTH_HEADER_NAME value: "X-Airbyte-Auth" diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index 26f5dffc70b..e74aedfa0e2 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -140,7 +140,9 @@ data: ACTIVITY_INITIAL_DELAY_BETWEEN_ATTEMPTS_SECONDS: {{ .Values.worker.activityInitialDelayBetweenAttemptsSeconds | default "" | quote }} ACTIVITY_MAX_DELAY_BETWEEN_ATTEMPTS_SECONDS: {{ .Values.worker.activityMaxDelayBetweenAttemptsSeconds | default "" | quote }} WORKFLOW_FAILURE_RESTART_DELAY_SECONDS: "" - + FILE_TRANSFER_EPHEMERAL_STORAGE_LIMIT: 5G + FILE_TRANSFER_EPHEMERAL_STORAGE_REQUEST: 5G + LAUNCHER_MICRONAUT_ENVIRONMENTS: "control-plane,oss" WORKERS_MICRONAUT_ENVIRONMENTS: "control-plane" CRON_MICRONAUT_ENVIRONMENTS: "control-plane" diff --git a/charts/helm-tests/tests/basic_template_test.go b/charts/helm-tests/tests/basic_template_test.go index 5c33b6a9569..84dc1477b9a 100644 --- a/charts/helm-tests/tests/basic_template_test.go +++ b/charts/helm-tests/tests/basic_template_test.go @@ -121,6 +121,8 @@ var commonConfigMapKeys = []string{ "DATABASE_URL", "DATA_DOCKER_MOUNT", "DB_DOCKER_MOUNT", + "FILE_TRANSFER_EPHEMERAL_STORAGE_LIMIT", + "FILE_TRANSFER_EPHEMERAL_STORAGE_REQUEST", "GOOGLE_APPLICATION_CREDENTIALS", "INTERNAL_API_HOST", "JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION",