From e4ba8f716561e7a37443af7bd25367bdeeb93dff Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Thu, 17 Sep 2020 19:10:35 +0000
Subject: [PATCH 1/2] Added ability to disable base_url

---
 deploy/kubernetes/helm/templates/tools.yaml | 2 ++
 deploy/kubernetes/helm/values.yaml.template | 1 +
 2 files changed, 3 insertions(+)

diff --git a/deploy/kubernetes/helm/templates/tools.yaml b/deploy/kubernetes/helm/templates/tools.yaml
index dfa63e51ae1..35c8e608406 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -116,7 +116,9 @@ spec:
             - >-
               heron-ui
               --port=8889
+              {{- if eq .Values.heron.enable_url true }}
               --base_url={{ .Values.heron.url | default $defaultUrl }}
+              {{- end }}
         - name: heron-apiserver
           image: {{ .Values.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
diff --git a/deploy/kubernetes/helm/values.yaml.template b/deploy/kubernetes/helm/values.yaml.template
index 5c25b810e4c..85008fbd9ac 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -39,6 +39,7 @@ jobReplicas: 1
 # amount of memory to provide for API server
 apiServerMemory: 512M
 heron:
+  enable_url: true
   url: ~
 # Topologies uploader
 uploader:

From eab338bb5a210f48146487e806def5950daa947e Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Wed, 23 Sep 2020 18:43:31 +0000
Subject: [PATCH 2/2] Updated to remove the need for a seperate variable

---
 deploy/kubernetes/helm/templates/tools.yaml | 4 ++--
 deploy/kubernetes/helm/values.yaml.template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/helm/templates/tools.yaml b/deploy/kubernetes/helm/templates/tools.yaml
index 35c8e608406..ada4ac109cf 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -116,8 +116,8 @@ spec:
             - >-
               heron-ui
               --port=8889
-              {{- if eq .Values.heron.enable_url true }}
-              --base_url={{ .Values.heron.url | default $defaultUrl }}
+              {{- if not (kindIs "invalid" .Values.heron.url) }}
+              --base_url={{ eq .Values.heron.url "-" | ternary $defaultUrl .Values.heron.url }}
               {{- end }}
         - name: heron-apiserver
           image: {{ .Values.image }}
diff --git a/deploy/kubernetes/helm/values.yaml.template b/deploy/kubernetes/helm/values.yaml.template
index 85008fbd9ac..8abf328fe43 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -39,8 +39,9 @@ jobReplicas: 1
 # amount of memory to provide for API server
 apiServerMemory: 512M
 heron:
-  enable_url: true
-  url: ~
+  # set to `-` to set base_url to the default k8s proxy URL
+  # set to `null` to remove the use of base_url
+  url: "-"
 # Topologies uploader
 uploader:
   class: dlog # s3