From 313ab39bfdba9fd2d6361d87bb8b2807802c06cc Mon Sep 17 00:00:00 2001
From: Wolfgang Kulhanek <WolfgangKulhanek@gmail.com>
Date: Mon, 11 Dec 2023 16:20:33 +0100
Subject: [PATCH] Fix templating errors

---
 charts/showroom-single-pod/files/index.html       | 15 +++++++--------
 charts/showroom-single-pod/templates/_helpers.tpl |  5 -----
 .../showroom-single-pod/templates/deployment.yaml |  2 +-
 charts/showroom-single-pod/templates/pvc.yaml     |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 charts/showroom-single-pod/templates/_helpers.tpl

diff --git a/charts/showroom-single-pod/files/index.html b/charts/showroom-single-pod/files/index.html
index 838e28f..b5ae47d 100644
--- a/charts/showroom-single-pod/files/index.html
+++ b/charts/showroom-single-pod/files/index.html
@@ -10,29 +10,28 @@
     <div class="content">
       <div class="split left">
         {{- if .Values.content.url }}
-        <iframe id="doc"  src="{{ .Values.content.url }}" width="100%" style="border:none;"></iframe>
+        <iframe id="doc" src="{{ .Values.content.url }}" width="100%" style="border:none;"></iframe>
         {{- else }}
         <!-- make this the content service -->
-        <iframe id="doc"  src="{{ include "showroom-deployer.showroom.route" (list "content" .Values) }}" width="100%" style="border:none;"></iframe>
+        <iframe id="doc" src="https://showroom.{{ .Release.Namespace }}.{{ .Values.deployer.domain }}/content" width="100%" style="border:none;"></iframe>
         {{- end }}
       </div>
       <div class="split right">
         <div class="tab">
           <button class="tablinks" onclick="openTerminal(event, 'terminal_tab')" id="defaultOpen" tabindex="0">Terminal</button>
-          {{- if .Values.codeserver }}
+          {{- if .Values.codeserver.setup }}
           <button class="tablinks" onclick="openTerminal(event, 'codeserver_tab')">VS Code</button>
           {{- end }}
-          {{- range .Values.services }}
+          <!-- {{- range .Values.services }}
           <button class="tablinks" onclick="openTerminal(event, 'svc_{{ .name }}_tab')">{{ .name }}</button>
-          {{- end }}
+          {{- end }} -->
         </div>
         <div id="terminal_tab" class="tabcontent">
-          <iframe id="terminal_01" src="{{ include "showroom-deployer.showroom.route" (list "wetty" .Values) }}" width="100%" style="border:none;"></iframe>
-          <!-- <iframe id="terminal_01" src="http://localhost:8081/wetty" width="100%" style="border:none;"></iframe> -->
+          <iframe id="terminal_01" src="https://showroom.{{ .Release.Namespace }}.{{ .Values.deployer.domain }}/terminal" width="100%" style="border:none;"></iframe>
         </div>
         {{- if .Values.codeserver.setup }}
         <div id="codeserver_tab" class="tabcontent">
-          <iframe id="codeserver" src="{{ include "showroom-deployer.showroom.route"  (list "codeserver" .Values) }}" width="100%" style="border:none;"></iframe>
+          <iframe id="codeserver" src="https://showroom.{{ .Release.Namespace }}.{{ .Values.deployer.domain }}/codeserver" width="100%" style="border:none;"></iframe>
         </div>
         {{- end }}
         {{- range .Values.services }}
diff --git a/charts/showroom-single-pod/templates/_helpers.tpl b/charts/showroom-single-pod/templates/_helpers.tpl
deleted file mode 100644
index 871dc70..0000000
--- a/charts/showroom-single-pod/templates/_helpers.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{- define "showroom-deployer.showroom.route" }}
-{{- $service := index . 0 -}}
-{{- $values := index . 1 -}}
-{{- printf "https://showroom-%s.%s/%s" .Release.Namespace $values.deployer.domain $service }}
-{{- end -}}
diff --git a/charts/showroom-single-pod/templates/deployment.yaml b/charts/showroom-single-pod/templates/deployment.yaml
index 292decf..9ed4366 100644
--- a/charts/showroom-single-pod/templates/deployment.yaml
+++ b/charts/showroom-single-pod/templates/deployment.yaml
@@ -102,7 +102,7 @@ spec:
       - name: nginx-cache
         emptyDir: {}
       - name: lab-user-home
-{{- if .Values.storage.setup }}
+{{- if .Values.terminal.storage.setup }}
         persistentVolumeClaim:
           claimName: lab-user-home
 {{- else }}
diff --git a/charts/showroom-single-pod/templates/pvc.yaml b/charts/showroom-single-pod/templates/pvc.yaml
index 80edef0..8a10c8f 100644
--- a/charts/showroom-single-pod/templates/pvc.yaml
+++ b/charts/showroom-single-pod/templates/pvc.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.storage.setup }}
+{{- if .Values.terminal.storage.setup }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim