From 80aea98846f664e4ec7437662ae5752eca00e4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Mei=C3=9Fl?= <stephan.meissl@eox.at> Date: Wed, 21 Oct 2020 17:14:36 +0200 Subject: [PATCH] use index.html like a template --- chart/files/index.html | 10 +++++----- chart/templates/client-configmap.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chart/files/index.html b/chart/files/index.html index 23b59e21..e5c65647 100644 --- a/chart/files/index.html +++ b/chart/files/index.html @@ -17,12 +17,12 @@ <div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div> <script src="prism.js"></script> <script> -var baseUrl = '//vhr18-dev.vs.hub.eox.at/'; +var baseUrl = '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/'; var baseUrlsWMTS = [ - '//vhr18-dev.vs.hub.eox.at/cache/ows/wmts', + '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/cache/ows/wmts', ]; var baseUrlsOws = [ - '//vhr18-dev.vs.hub.eox.at/ows', + '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/ows', ]; var config = { "settings": { @@ -274,7 +274,7 @@ var config = { // "method": "GET", "rewrite": { // add __coverage to the coverageId - "from": "({{id}})", + "from": "({{ "{{" }}id}})", "to": "$1__coverage" } } @@ -369,7 +369,7 @@ var config = { // "method": "GET", "rewrite": { // add __coverage to the coverageId - "from": "({{id}})", + "from": "({{ "{{" }}id}})", "to": "$1__coverage" } } diff --git a/chart/templates/client-configmap.yaml b/chart/templates/client-configmap.yaml index 4b130f7e..c3cc92b7 100644 --- a/chart/templates/client-configmap.yaml +++ b/chart/templates/client-configmap.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: {{ include "vs.fullname" . }}-client data: - {{ (.Files.Glob "files/index.html").AsConfig | nindent 2}} + {{ (tpl (.Files.Glob "files/index.html").AsConfig . ) | nindent 2}} -- GitLab