diff --git a/k8s/helm/metaflow/charts/metaflow-ui/templates/_helpers.tpl b/k8s/helm/metaflow/charts/metaflow-ui/templates/_helpers.tpl index 06e648d..103c40d 100644 --- a/k8s/helm/metaflow/charts/metaflow-ui/templates/_helpers.tpl +++ b/k8s/helm/metaflow/charts/metaflow-ui/templates/_helpers.tpl @@ -95,6 +95,17 @@ Create the name of the service account to use {{- end }} {{- end }} +{{/* +Create the backendURL, which differs if we use an ingress or not. +*/}} +{{- define "metaflow-ui.staticUIBackendURL" -}} +{{- if .Values.ingress.enabled }} +{{- default "http://localhost/api/" .Values.uiStatic.metaflowUIBackendURL }} +{{- else }} +{{- default "http://localhost:8083/api/" .Values.uiStatic.metaflowUIBackendURL }} +{{- end }} +{{- end }} + {{- define "metaflow-ui.metadatadbEnvVars" -}} - name: MF_METADATA_DB_NAME value: {{ .Values.uiBackend.metadatadb.name | quote }} diff --git a/k8s/helm/metaflow/charts/metaflow-ui/templates/static_deployment.yaml b/k8s/helm/metaflow/charts/metaflow-ui/templates/static_deployment.yaml index 299fe0b..7369511 100644 --- a/k8s/helm/metaflow/charts/metaflow-ui/templates/static_deployment.yaml +++ b/k8s/helm/metaflow/charts/metaflow-ui/templates/static_deployment.yaml @@ -45,7 +45,7 @@ spec: port: http env: - name: METAFLOW_SERVICE - value: {{ .Values.uiStatic.metaflowUIBackendURL | quote }} + value: {{ include "metaflow-ui.staticUIBackendURL" . | quote }} {{- range .Values.env }} - name: {{ .name | quote }} value: {{ .value | quote }} diff --git a/k8s/helm/metaflow/charts/metaflow-ui/values.yaml b/k8s/helm/metaflow/charts/metaflow-ui/values.yaml index fccf446..efc2131 100644 --- a/k8s/helm/metaflow/charts/metaflow-ui/values.yaml +++ b/k8s/helm/metaflow/charts/metaflow-ui/values.yaml @@ -72,7 +72,7 @@ uiStatic: # - name: var_name # value: "var_value" - metaflowUIBackendURL: "http://localhost:8083/api/" + metaflowUIBackendURL: "" service: type: ClusterIP