From 1d4599fc1c7cd783c6c2857194276eb1f5513ba6 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 7 Dec 2022 12:03:15 +0100
Subject: [PATCH] prod: update tricot and reduce resource constraints

---
 cluster/prod/app/core/deploy/core.hcl           |  6 +++---
 cluster/prod/app/cryptpad/deploy/cryptpad.hcl   |  1 +
 cluster/prod/app/drone-ci/deploy/server.hcl     |  6 +++---
 cluster/prod/app/telemetry/deploy/telemetry.hcl | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cluster/prod/app/core/deploy/core.hcl b/cluster/prod/app/core/deploy/core.hcl
index 8c4f01b..1d25531 100644
--- a/cluster/prod/app/core/deploy/core.hcl
+++ b/cluster/prod/app/core/deploy/core.hcl
@@ -5,10 +5,10 @@ job "core" {
 
   update {
     max_parallel = 1
-    stagger = "1m"
+    stagger = "5m"
   }
 
-  group "network" {
+  group "diplonat" {
     task "diplonat" {
       driver = "docker"
 
@@ -82,7 +82,7 @@ EOH
       driver = "docker"
 
       config {
-        image = "lxpz/amd64_tricot:45"
+        image = "lxpz/amd64_tricot:46"
         network_mode = "host"
         readonly_rootfs = true
         ports = [ "http_port", "https_port" ]
diff --git a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
index 726fe5a..59803bf 100644
--- a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
+++ b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
@@ -56,6 +56,7 @@ job "cryptpad" {
       }
 
       service {
+        name = "cryptpad"
         port = "http"
         tags = [
           "tricot pad.deuxfleurs.fr",
diff --git a/cluster/prod/app/drone-ci/deploy/server.hcl b/cluster/prod/app/drone-ci/deploy/server.hcl
index 735733b..a42a9b1 100644
--- a/cluster/prod/app/drone-ci/deploy/server.hcl
+++ b/cluster/prod/app/drone-ci/deploy/server.hcl
@@ -36,7 +36,7 @@ job "drone-ci" {
 
       resources {
         memory = 200
-        cpu = 1000
+        cpu = 100
       }
     }
 
@@ -81,7 +81,7 @@ EOH
 
       resources {
         cpu = 100
-        memory = 100
+        memory = 200
       }
 
       service {
@@ -129,7 +129,7 @@ EOH
       }
 
       resources {
-        memory = 250
+        memory = 200
         cpu = 100
       }
     }
diff --git a/cluster/prod/app/telemetry/deploy/telemetry.hcl b/cluster/prod/app/telemetry/deploy/telemetry.hcl
index af3088c..8a7dbcc 100644
--- a/cluster/prod/app/telemetry/deploy/telemetry.hcl
+++ b/cluster/prod/app/telemetry/deploy/telemetry.hcl
@@ -70,8 +70,8 @@ job "telemetry" {
       }
 
       resources {
-        memory = 501
-        cpu = 500
+        memory = 1000
+        cpu = 1000
       }
 
       service {
@@ -130,7 +130,7 @@ job "telemetry" {
 
       resources {
         memory = 200
-        cpu = 1000
+        cpu = 100
       }
     }
 
@@ -168,8 +168,8 @@ EOH
       }
 
       resources {
-        memory = 501
-        cpu = 100
+        memory = 500
+        cpu = 500
       }
 
       service {