From b42e42faaa4db3123106d8d7342100b4681096b7 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 8 Mar 2021 16:34:41 +0100
Subject: [PATCH] Improve resource allocation

---
 app/garage/deploy/garage.hcl   | 4 ++--
 app/im/deploy/im.hcl           | 4 ++--
 app/jitsi/deploy/jitsi.hcl     | 2 ++
 app/science/deploy/science.hcl | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/garage/deploy/garage.hcl b/app/garage/deploy/garage.hcl
index a52f660..fa1f446 100644
--- a/app/garage/deploy/garage.hcl
+++ b/app/garage/deploy/garage.hcl
@@ -1,7 +1,7 @@
 job "garage" {
   datacenters = ["dc1", "belair", "saturne"]
   type = "system"
-  priority = 40
+  priority = 80
 
   constraint {
     attribute = "${attr.cpu.arch}"
@@ -18,7 +18,7 @@ job "garage" {
 	update {
 		max_parallel = 1
 		min_healthy_time = "30s"
-		healthy_deadline = "10m"
+		healthy_deadline = "5m"
 	}
 
     task "server" {
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index 96a6506..f90dd27 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -162,8 +162,8 @@ job "im" {
       }
 
       resources {
-        memory = 500
-        cpu = 1000
+        memory = 250
+        cpu = 100
       }
 
       service {
diff --git a/app/jitsi/deploy/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl
index 2f98ecb..87ba81f 100644
--- a/app/jitsi/deploy/jitsi.hcl
+++ b/app/jitsi/deploy/jitsi.hcl
@@ -2,6 +2,8 @@ job "jitsi" {
   datacenters = ["dc1"]
   type = "service"
 
+  priority = "10"
+
   constraint {
     attribute = "${attr.cpu.arch}"
     value     = "amd64"
diff --git a/app/science/deploy/science.hcl b/app/science/deploy/science.hcl
index 1aee7a8..1701027 100644
--- a/app/science/deploy/science.hcl
+++ b/app/science/deploy/science.hcl
@@ -26,8 +26,8 @@ job "science" {
       }
 
       resources {
-        cpu = 1000
-        memory = 1200
+        cpu = 100
+        memory = 250
       }
 
       service {