From d0db893a9572ed379b203d1abf8a9ac677953ffe Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Fri, 6 Sep 2024 09:01:16 +0100
Subject: [PATCH] Changed API to allow importing config from files

---
 templates/components/grafana.jsonnet  | 37 ++++++++++++++++-----------
 templates/components/vertexai.jsonnet |  8 +++++-
 templates/k8s.jsonnet                 |  6 ++---
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet
index ca33e080..5bacceb9 100644
--- a/templates/components/grafana.jsonnet
+++ b/templates/components/grafana.jsonnet
@@ -9,7 +9,10 @@ local images = import "values/images.jsonnet";
 
             local vol = engine.volume("prometheus-data").with_size("20G");
             local cfgVol = engine.configVolume(
-                "prometheus-cfg", "./prometheus"
+                "prometheus-cfg", "./prometheus",
+		{
+		    "prometheus.cfg": importstr "prometheus/prometheus.yml",
+		}
             );
 
             local container =
@@ -38,14 +41,21 @@ local images = import "values/images.jsonnet";
         create:: function(engine)
 
             local vol = engine.volume("grafana-storage").with_size("20G");
-            local cv1 = engine.configVolume(
-                "dashboard-yml", "./grafana/dashboard.yml"
+
+            local provVol = engine.configVolume(
+                "provisioning", "./grafana/",
+		{
+		    "dashboard.yml": importstr "grafana/dashboard.yml",
+		    "datasource.yml": importstr "grafana/datasource.yml",
+		}
+		
             );
-            local cv2 = engine.configVolume(
-                "datasource-yml", "./grafana/datasource.yml"
-            );
-            local cv3 = engine.configVolume(
-                "dashboard-json", "./grafana/dashboard.json"
+            local dashVol = engine.configVolume(
+                "dashboards", "./grafana/",
+		{
+		    "dashboard.json": importstr "grafana/dashboard.json",
+		}
+		
             );
 
             local container =
@@ -62,19 +72,16 @@ local images = import "values/images.jsonnet";
                     .with_reservations("0.5", "256M")
                     .with_port(3000, 3000, "cassandra")
                     .with_volume_mount(vol, "/var/lib/grafana")
-                    .with_volume_mount(cv1, "/etc/grafana/provisioning/dashboards/dashboard.yml")
-                    .with_volume_mount(cv2, "/etc/grafana/provisioning/datasources/datasource.yml")
-                    .with_volume_mount(cv3, "/var/lib/grafana/dashboards/dashboard.json");
+                    .with_volume_mount(provVol, "/etc/grafana/provisioning/dashboards/")
+                    .with_volume_mount(dashVol, "/etc/grafana/provisioning/dash/");
 
             local containerSet = engine.containers(
                 "grafana", [ container ]
             );
 
             engine.resources([
-                vol,
-                cv1,
-                cv2,
-                cv3,
+	        provVol,
+		dashVol,
                 containerSet,
             ])
 
diff --git a/templates/components/vertexai.jsonnet b/templates/components/vertexai.jsonnet
index f2fd3d86..372ec4d1 100644
--- a/templates/components/vertexai.jsonnet
+++ b/templates/components/vertexai.jsonnet
@@ -15,7 +15,13 @@ local prompts = import "prompts/mixtral.jsonnet";
     
         create:: function(engine)
 
-            local cfgVol = engine.configVolume("./vertexai");
+            local cfgVol = engine.configVolume(
+	        "vertexai-creds",
+	        "./vertexai",
+		{
+		    "private.json": importstr "vertexai/private.json",
+		}
+            );
 
             local container =
                 engine.container("text-completion")
diff --git a/templates/k8s.jsonnet b/templates/k8s.jsonnet
index b5a72573..60032004 100644
--- a/templates/k8s.jsonnet
+++ b/templates/k8s.jsonnet
@@ -203,7 +203,7 @@
     },
 
     // FIXME: For K8s
-    configVolume:: function(name, dir)
+    configVolume:: function(name, dir, parts)
     {
 
         local volume = self,
@@ -221,9 +221,7 @@
                         name: volume.name,
                         namespace: "trustgraph",
                     },
-                    data: {
-                        thing: "asldkajsdj"
-                    }
+                    data: parts
                 },
             }
         },