From 9ec21423d69f891f3898588a78f3cfc4bbb8dca2 Mon Sep 17 00:00:00 2001
From: "Chang, Hui-Tang" <huitang.chang@instill.tech>
Date: Mon, 26 Aug 2024 01:59:59 +0800
Subject: [PATCH] chore(charts): remove host/port override for model and
 artifact backend (#1075)

Because

- The host/port override for the model and artifact backends is no
longer needed.

This commit

- Removes the host/port override for the model and artifact backends.
---
 charts/core/templates/pipeline-backend/configmap.yaml | 8 ++++----
 charts/core/values.yaml                               | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/charts/core/templates/pipeline-backend/configmap.yaml b/charts/core/templates/pipeline-backend/configmap.yaml
index efd55e1b..a4c138c9 100644
--- a/charts/core/templates/pipeline-backend/configmap.yaml
+++ b/charts/core/templates/pipeline-backend/configmap.yaml
@@ -38,16 +38,16 @@ data:
         key: /etc/instill-ai/vdp/ssl/mgmt/tls.key
       {{- end }}
     artifactbackend:
-      host: {{ default (include "core.artifactBackend" . ) .Values.pipelineBackend.artifactBackendHostOverride }}
-      publicport: {{ default (include "core.artifactBackend.publicPort" . ) .Values.pipelineBackend.artifactBackendPortOverride }}
+      host: {{ template "core.artifactBackend" . }}
+      publicport: {{ template "core.artifactBackend.publicPort" . }}
       {{- if .Values.internalTLS.enabled }}
       https:
         cert: /etc/instill-ai/vdp/ssl/artifact/tls.crt
         key: /etc/instill-ai/vdp/ssl/artifact/tls.key
       {{- end }}
     modelbackend:
-      host: {{ default (include "core.modelBackend" . ) .Values.pipelineBackend.modelBackendHostOverride }}
-      publicport: {{ default (include "core.modelBackend.publicPort" . ) .Values.pipelineBackend.modelBackendPortOverride }}
+      host: {{ template "core.modelBackend" . }}
+      publicport: {{ template "core.modelBackend.publicPort" . }}
       {{- if .Values.internalTLS.enabled }}
       https:
         cert: /etc/instill-ai/vdp/ssl/model/tls.crt
diff --git a/charts/core/values.yaml b/charts/core/values.yaml
index 50426822..1a033245 100644
--- a/charts/core/values.yaml
+++ b/charts/core/values.yaml
@@ -453,10 +453,6 @@ pipelineBackend:
     spec:
       minAvailable:
       maxUnavailable:
-  modelBackendHostOverride:
-  modelBackendPortOverride:
-  artifactBackendHostOverride:
-  artifactBackendPortOverride:
   minio:
     port: 9000
     rootuser: minioadmin