apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-17 17:21:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Configmap volume, just missing the file content

Browse source
This commit is contained in:
Cyber MacGeddon 2024-09-05 23:06:23 +01:00
parent 27e119f22e
commit ae8b612b98
2 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
templates/components/grafana.jsonnet
View file

@ -8,8 +8,9 @@ local images = import "values/images.jsonnet";
create:: function(engine)
local vol = engine.volume("prometheus-data").with_size("20G");
local cfgVol = engine.configVolume("./prometheus")
.with_size("20G");
local cfgVol = engine.configVolume(
"prometheus-cfg", "./prometheus"
);
local container =
engine.container("prometheus")
@ -18,8 +19,7 @@ local images = import "values/images.jsonnet";
.with_reservations("0.1", "128M")
.with_port(9090, 9090, "http")
.with_volume_mount(cfgVol, "/etc/prometheus")
.with_volume_mount(vol, "/prometheus")
;
.with_volume_mount(vol, "/prometheus");
local containerSet = engine.containers(
"prometheus", [ container ]
@ -38,12 +38,15 @@ local images = import "values/images.jsonnet";
create:: function(engine)
local vol = engine.volume("grafana-storage").with_size("20G");
local cv1 = engine.configVolume("./grafana/dashboard.yml")
.with_size("20G");
local cv2 = engine.configVolume("./grafana/datasource.yml")
.with_size("20G");
local cv3 = engine.configVolume("./grafana/dashboard.json")
.with_size("20G");
local cv1 = engine.configVolume(
"dashboard-yml", "./grafana/dashboard.yml"
);
local cv2 = engine.configVolume(
"datasource-yml", "./grafana/datasource.yml"
);
local cv3 = engine.configVolume(
"dashboard-json", "./grafana/dashboard.json"
);
local container =
engine.container("grafana")
@ -58,11 +61,10 @@ local images = import "values/images.jsonnet";
.with_limits("1.0", "256M")
.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(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");
local containerSet = engine.containers(
"grafana", [ container ]

19
templates/k8s.jsonnet
View file

@ -197,13 +197,13 @@
volRef:: function() {
name: volume.name,
persistentVolumeClaim: { name: volume.name },
persistentVolumeClaim: { name: volume.name + "-pvc" },
}
},
// FIXME: For K8s
configVolume:: function(name)
configVolume:: function(name, dir)
{
local volume = self,
@ -213,11 +213,24 @@
with_size:: function(size) self + { size: size },
add:: function() {
resources +: {
[volume.name + "-cm"]: {
apiVersion: "v1",
kind: "ConfigMap",
metadata: {
name: volume.name,
namespace: "trustgraph",
},
data: {
thing: "asldkajsdj"
}
},
}
},
volRef:: function() {
name: volume.name,
ASDpersistentVolumeClaim: { name: volume.name },
configMap: { name: volume.name + "-cm" },
}
},