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 270f77e Fix service url in Helm chart (#3534)
270f77e is described below
commit 270f77e655115b0ee3d6991ddfa731d5b26c9931
Author: Oliver Bristow <[email protected]>
AuthorDate: Tue Jun 2 02:55:02 2020 +0100
Fix service url in Helm chart (#3534)
The template string in the values.yaml wasn't rendered, so this patch
renders the default value in the template
---
deploy/kubernetes/helm/templates/tools.yaml | 3 ++-
deploy/kubernetes/helm/values.yaml.template | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/deploy/kubernetes/helm/templates/tools.yaml
b/deploy/kubernetes/helm/templates/tools.yaml
index 64d57b7..2d3b8d3 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -17,6 +17,7 @@
{{- $platform := .Values.platform -}}
{{- $jobReplicas := .Values.jobReplicas -}}
+{{- $defaultUrl := (printf "/api/v1/namespaces/%s/services/%s-ui:8889/proxy"
.Release.Namespace .Release.Name) -}}
{{- $apiServerMemory := .Values.apiServerMemory }}
apiVersion: v1
@@ -115,7 +116,7 @@ spec:
- >-
heron-ui
--port=8889
- --base_url={{ .Values.heron.url }}
+ --base_url={{ $defaultUrl }}
- 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 ae310be..313211b 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -39,7 +39,7 @@ jobReplicas: 1
# amount of memory to provide for API server
apiServerMemory: 512M
heron:
- url: /api/v1/namespaces/{{ .Release.Namespace }}/services/{{ .Release.Name
}}-ui:8889/proxy
+ url: ~
# Topologies uploader
uploader:
class: dlog # s3
