This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new fe1c199 Added ability to disable base_url in Helm chart (#3619)
fe1c199 is described below
commit fe1c1990acfaec6a22cea1da843567dce68d5384
Author: Nicholas Nezis <[email protected]>
AuthorDate: Wed Sep 23 18:55:24 2020 -0400
Added ability to disable base_url in Helm chart (#3619)
---
deploy/kubernetes/helm/templates/tools.yaml | 4 +++-
deploy/kubernetes/helm/values.yaml.template | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/deploy/kubernetes/helm/templates/tools.yaml
b/deploy/kubernetes/helm/templates/tools.yaml
index 7632485..d63beed 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -116,7 +116,9 @@ spec:
- >-
heron-ui
--port=8889
- --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 }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
diff --git a/deploy/kubernetes/helm/values.yaml.template
b/deploy/kubernetes/helm/values.yaml.template
index 5c25b81..8abf328 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -39,7 +39,9 @@ jobReplicas: 1
# amount of memory to provide for API server
apiServerMemory: 512M
heron:
- 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
