commit c2c917a30091a590ee0d47b9c09c9efd727db644
author Matteo Scandolo <matteo.scandolo@gmail.com> Tue Apr 06 09:15:31 2021 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Apr 08 12:03:54 2021 -0700
tree d9311241dcc49c9b12e600a6adc5c628e505f06a
parent afd8e84c1e582a96a1380494ac7ec3b6c0ca9be2

Adding possibility to customize the domain name when using Ingress in VOLTHA

Change-Id: Iaad15dfd4e756cba551413c799dd2a14578211a9

voltha/templates/_helpers.tpl

diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index 0fd902b..2e399d3 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -24,6 +24,6 @@
 {{/* Create a default fully qualified virtual hostname. We truncate at 63 chars because . . . */}}
 {{- define "virtual-hostname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- $fullname := default (printf "%s.%s.local" .Values.global.stack_name $name) .Values.fullNameOverride -}}
+{{- $fullname := default (print .Values.global.stack_name "." $name "." .Values.ingress.baseHostname) .Values.fullHostnameOverride -}}
 {{- $fullname | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

voltha/templates/ingress.yaml

diff --git a/voltha/templates/ingress.yaml b/voltha/templates/ingress.yaml
index 69d161c..01158cc 100644
--- a/voltha/templates/ingress.yaml
+++ b/voltha/templates/ingress.yaml
@@ -40,7 +40,7 @@
   rules:
     {{- range .Values.ingress.hosts }}
     {{- if $.Values.ingress.enableVirtualHosts }}
-    - host: '{{ template "virtual-hostname" $ }}'
+    - host: {{ template "virtual-hostname" $ }}
       http:
     {{- else }}
     {{- if .host }}