From 583f11db0cefc124e04a55252d5073b04f2840df Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Sat, 7 Sep 2024 11:06:20 +0100
Subject: [PATCH] Hacking around

---
 templates/components/grafana.jsonnet |  1 +
 templates/components/pulsar.jsonnet  |  9 +++++----
 templates/config-to-k8s.jsonnet      | 13 ++++++++++++-
 templates/k8s.jsonnet                | 18 ++++++++++++++----
 templates/values/version.jsonnet     |  1 +
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 templates/values/version.jsonnet

diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet
index 7dfa75ad..1346e105 100644
--- a/templates/components/grafana.jsonnet
+++ b/templates/components/grafana.jsonnet
@@ -97,6 +97,7 @@ local images = import "values/images.jsonnet";
                 .with_port(3000, 3000, "http");
 
             engine.resources([
+                vol,
 	        provVol,
 		dashVol,
                 containerSet,
diff --git a/templates/components/pulsar.jsonnet b/templates/components/pulsar.jsonnet
index fd1d437c..eb1b894e 100644
--- a/templates/components/pulsar.jsonnet
+++ b/templates/components/pulsar.jsonnet
@@ -7,19 +7,20 @@ local images = import "values/images.jsonnet";
 
         create:: function(engine)
 
-            local confVolume = engine.volume("pulsar-conf").with_size("2G");
+//            local confVolume = engine.volume("pulsar-conf").with_size("2G");
             local dataVolume = engine.volume("pulsar-data").with_size("20G");
 
             local container =
                 engine.container("pulsar")
                     .with_image(images.pulsar)
-                    .with_command(["bin/pulsar", "standalone"])
+//                    .with_command(["bin/pulsar", "standalone"])
+                    .with_command(["bin/sh", "-c", "sleep 1000000"])
                     .with_environment({
                         "PULSAR_MEM": "-Xms700M -Xmx700M"
                     })
                     .with_limits("1.0", "900M")
                     .with_reservations("0.5", "900M")
-                    .with_volume_mount(confVolume, "/pulsar/conf")
+//                    .with_volume_mount(confVolume, "/pulsar/conf")
                     .with_volume_mount(dataVolume, "/pulsar/data")
                     .with_port(6650, 6650, "bookie")
                     .with_port(8080, 8080, "http");
@@ -48,7 +49,7 @@ local images = import "values/images.jsonnet";
                 .with_port(8080, 8080, "http");
 
             engine.resources([
-                confVolume,
+//                confVolume,
                 dataVolume,
                 containerSet,
                 service,
diff --git a/templates/config-to-k8s.jsonnet b/templates/config-to-k8s.jsonnet
index ef39a5bd..560ea5c0 100644
--- a/templates/config-to-k8s.jsonnet
+++ b/templates/config-to-k8s.jsonnet
@@ -19,6 +19,17 @@ local ns = {
     },
 };
 
+local sc = {
+    apiVersion: "storage.k8s.io/v1",
+    kind: "StorageClass",
+    metadata: {
+        name: "tg",
+    },
+    provisioner: "k8s.io/minikube-hostpath",
+    reclaimPolicy: "Delete",
+    volumeBindingMode: "Immediate",
+};
+
 // Extract resources usnig the engine
 local resources = std.foldl(
     function(state, p) state + p.create(engine),
@@ -29,7 +40,7 @@ local resources = std.foldl(
 local resourceList = {
     apiVersion: "v1",
     kind: "List",
-    items: [ns] + std.objectValues(resources.resources),
+    items: [ns, sc] + std.objectValues(resources.resources),
 };
 
 std.manifestYamlDoc(resourceList, quote_keys=false)
diff --git a/templates/k8s.jsonnet b/templates/k8s.jsonnet
index 3934b492..ea8f5179 100644
--- a/templates/k8s.jsonnet
+++ b/templates/k8s.jsonnet
@@ -10,6 +10,16 @@
         reservations: {},
         ports: [],
         volumes: [],
+        securityContext: {
+            fsGroup: 1234
+//            runAsUser: 65534
+//            runAsGroup: 65534
+//            runAsNonRoot: true
+//            runAsUser: 0,
+//            runAsGroup: 0,
+//            runAsNonRoot: true,
+//            readOnlyRootFilesystem: true,
+        },
 
         with_image:: function(x) self + { image: x },
 
@@ -196,7 +206,7 @@
                         }
                     },
                     spec: {
-                        storageClassName: "manual",
+                        storageClassName: "tg",
                         capacity: {
                             storage: volume.size,
                         },
@@ -214,14 +224,14 @@
                         namespace: "trustgraph",
                     },
                     spec: {
-                        storageClassName: "manual",
+                        storageClassName: "tg",
                         accessModes: [ "ReadWriteOnce" ],
                         resources: {
                             requests: {
                                 storage: volume.size,
                             }
                         },
-                        volumeName: volume.name + "-pv",
+                        volumeName: volume.name,
                     }
                 }
             }
@@ -229,7 +239,7 @@
 
         volRef:: function() {
             name: volume.name,
-            persistentVolumeClaim: { claimName: volume.name + "-pvc" },
+            persistentVolumeClaim: { claimName: volume.name },
         }
 
     },
diff --git a/templates/values/version.jsonnet b/templates/values/version.jsonnet
new file mode 100644
index 00000000..e127b65d
--- /dev/null
+++ b/templates/values/version.jsonnet
@@ -0,0 +1 @@
+"0.9.3"