aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cluster/staging/app/core/deploy/core-system.hcl4
-rw-r--r--cluster/staging/app/garage/deploy/garage.hcl4
-rw-r--r--cluster/staging/app/telemetry/deploy/telemetry-service.hcl6
3 files changed, 7 insertions, 7 deletions
diff --git a/cluster/staging/app/core/deploy/core-system.hcl b/cluster/staging/app/core/deploy/core-system.hcl
index 53babd7..5cdffa7 100644
--- a/cluster/staging/app/core/deploy/core-system.hcl
+++ b/cluster/staging/app/core/deploy/core-system.hcl
@@ -83,7 +83,7 @@ EOH
config {
packages = [
- "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=3c5aa3680eab1989361026b96e4968b4cd92dcb5"
+ "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=f163d1d348c78a27bb19a86a6158f4b5d1287f6f"
]
command = "tricot"
# cap_add = [ "net_bind_service" ] # this doesn't work for whatever reason, so we need to put user = "root" instead
@@ -91,7 +91,7 @@ EOH
user = "root"
resources {
- cpu = 1000
+ cpu = 500
memory = 200
}
diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl
index f8e14d9..0d2c803 100644
--- a/cluster/staging/app/garage/deploy/garage.hcl
+++ b/cluster/staging/app/garage/deploy/garage.hcl
@@ -25,7 +25,7 @@ job "garage-staging" {
config {
packages = [
"#bash", # so that we can enter a shell inside container
- "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=cli-improvements&rev=041b60ed1dc48563ad297a6a30230655555c9a20",
+ "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=interrupted-cleanup&rev=0650a43cf14e7e52121a553130a9ea6c92b7bd4a",
]
command = "garage"
args = [ "server" ]
@@ -63,7 +63,7 @@ job "garage-staging" {
}
resources {
- memory = 2000
+ memory = 1500
memory_max = 3000
cpu = 500
}
diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
index e765bb9..1c59a79 100644
--- a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
+++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
@@ -149,7 +149,7 @@ GF_SECURITY_ADMIN_PASSWORD={{ key "secrets/telemetry/grafana/admin_password" }}
resources {
memory = 300
- cpu = 800
+ cpu = 300
}
restart {
@@ -230,8 +230,8 @@ GF_SECURITY_ADMIN_PASSWORD={{ key "secrets/telemetry/grafana/admin_password" }}
ports = [ "jaeger-frontend", "jaeger-otlp-grpc", "jaeger-otlp-http" ]
}
resources {
- memory = 2000
- cpu = 1000
+ memory = 1000
+ cpu = 500
}
template {