From 8f8b4e5ba75cffcfcc3d650fecb6513373a3b8a1 Mon Sep 17 00:00:00 2001 From: Bryce Groff Date: Sun, 17 Mar 2024 21:39:07 -0700 Subject: [PATCH] Use the webapp-url when deploying as Enterprise. This is probably broken for OSS, so this needs some review and suggestions. --- charts/airbyte-server/templates/deployment.yaml | 5 +++++ charts/airbyte/templates/env-configmap.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index ab4427e1a11..bc439e0ce47 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -67,6 +67,11 @@ spec: value: "true" {{- end }} {{- if eq .Values.global.deploymentMode "oss" }} + - name: AIRBYTE_API_HOST + valueFrom: + configMapKeyRef: + name: {{ .Release.Name }}-airbyte-env + key: AIRBYTE_API_HOST - name: AIRBYTE_VERSION valueFrom: configMapKeyRef: diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index 7843490d71b..d657df46b71 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -46,7 +46,7 @@ data: KEYCLOAK_INTERNAL_HOST: localhost # just a placeholder so that nginx template is valid - shouldn't be used when edition isn't "pro" {{- end }} CONNECTOR_BUILDER_API_HOST: {{ .Release.Name }}-airbyte-connector-builder-server-svc:{{ index .Values "connector-builder-server" "service" "port" }} - AIRBYTE_API_HOST: {{ .Release.Name }}-airbyte-api-server-svc:{{ index .Values "airbyte-api-server" "service" "port" }} + AIRBYTE_API_HOST: {{ printf "%s/api/public/v1" (index $airbyteYmlDict "webapp-url") | quote }} {{- if $.Values.global.jobs.kube.annotations }} JOB_KUBE_ANNOTATIONS: {{ $.Values.global.jobs.kube.annotations | include "airbyte.flattenMap" | quote }} {{- end }}