caddy: abstract individual services into objects in values.yaml

pinheadmz · pinheadmz · commit b8b9af0ebd8c · 2025-09-17T13:17:14.000-04:00
diff --git a/resources/charts/caddy/templates/configmap.yaml b/resources/charts/caddy/templates/configmap.yaml
@@ -6,6 +6,34 @@ metadata:
     {{- include "caddy.labels" . | nindent 4 }}
 data:
   Caddyfile: |
-    {{- .Values.caddyConfig | nindent 4 }}
+    :80 {
+      respond /live 200
+      respond /ready 200
+
+      root * /usr/share/caddy
+      file_server
+
+      {{- range .Values.services }}
+      handle_path {{ .path }}* {
+        reverse_proxy {{ .host }}:{{ .port }}
+      }
+      {{- end }}
+    }
   index: |
-    {{- .Values.htmlConfig | nindent 4 }}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Warnet Dashboard</title>
+    </head>
+    <body>
+        <h1>Welcome to the Warnet dashboard</h1>
+        <p>You can access the following services:</p>
+        <ul>
+            {{- range .Values.services }}
+            <li><a href="{{ .path }}">{{ .title }}</a></li>
+            {{- end }}
+        </ul>
+    </body>
+    </html>
diff --git a/resources/charts/caddy/values.yaml b/resources/charts/caddy/values.yaml
@@ -86,38 +86,13 @@ volumeMounts:
 
 port: 80
 
-caddyConfig: |
-  :80 {
-    respond /live 200
-    respond /ready 200
-
-    root * /usr/share/caddy
-    file_server
-
-    handle_path /fork-observer/* {
-      reverse_proxy fork-observer:2323
-    }
-
-    handle_path /grafana/* {
-      reverse_proxy loki-grafana:80
-    }
-
-  }
-
-htmlConfig: |
-  <!DOCTYPE html>
-  <html lang="en">
-  <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Welcome</title>
-  </head>
-  <body>
-      <h1>Welcome to the Warnet dashboard</h1>
-      <p>You can access the following services:</p>
-      <ul>
-          <li><a href="/grafana/">Grafana</a></li>
-          <li><a href="/fork-observer/">Fork Observer</a></li>
-      </ul>
-  </body>
-  </html>
+services:
+  - title: Grafana
+    path: /grafana/
+    host: loki-grafana
+    port: 80
+  - title: Fork Observer
+    path: /fork-observer/
+    host: fork-observer
+    port: 2323
+    
