From 7a2d1fe9a6417464080337530277768a2c111c87 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 3 Apr 2024 09:12:44 +0200
Subject: [PATCH] Move constraints to the controller only

---
 controller.nomad.hcl         |  4 +++-
 example/controller.nomad.hcl |  9 ++++-----
 example/node.nomad.hcl       | 15 ---------------
 variables.yml                |  8 +++++---
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/controller.nomad.hcl b/controller.nomad.hcl
index c80d2ec..b2f3269 100644
--- a/controller.nomad.hcl
+++ b/controller.nomad.hcl
@@ -1,6 +1,6 @@
 job "[[ .instance ]]-controller" {
 
-[[ $c := merge .democratic_csi.controller .democratic_csi . -]]
+[[ $c := merge .democratic_csi . -]]
 
 [[- template "common/job_start" $c ]]
 
@@ -8,6 +8,8 @@ job "[[ .instance ]]-controller" {
 
   group "[[ $proto ]]-controller" {
 
+[[ $c := merge $c.controller $c ]]
+
     count = [[ $c.count ]]
 
 [[ template "common/constraints" $c ]]
diff --git a/example/controller.nomad.hcl b/example/controller.nomad.hcl
index cb22722..b3b49e6 100644
--- a/example/controller.nomad.hcl
+++ b/example/controller.nomad.hcl
@@ -6,15 +6,12 @@ job "democratic-csi-controller" {
   priority    = 90
 
 
-  constraint {
-    operator = "distinct_hosts"
-    value    = "true"
-  }
-
 
 
   group "iscsi-controller" {
 
+
+
     count = 1
 
 
@@ -163,6 +160,8 @@ _EOF
 
   group "nfs-controller" {
 
+
+
     count = 1
 
 
diff --git a/example/node.nomad.hcl b/example/node.nomad.hcl
index 68d03be..cb6a5fb 100644
--- a/example/node.nomad.hcl
+++ b/example/node.nomad.hcl
@@ -6,22 +6,12 @@ job "democratic-csi-node" {
   priority    = 90
 
 
-  constraint {
-    operator = "distinct_hosts"
-    value    = "true"
-  }
-
 
 
   group "iscsi-node" {
 
 
 
-    constraint {
-      operator = "distinct_hosts"
-      value    = "true"
-    }
-
 
     service {
       name = "democratic-csi-iscsi-node"
@@ -139,11 +129,6 @@ _EOF
 
 
 
-    constraint {
-      operator = "distinct_hosts"
-      value    = "true"
-    }
-
 
     service {
       name = "democratic-csi-nfs-node"
diff --git a/variables.yml b/variables.yml
index e814fb3..0550ffa 100644
--- a/variables.yml
+++ b/variables.yml
@@ -18,15 +18,17 @@ democratic_csi:
   nomad:
     # Set a high priority as CSI controllers and nodes are required for a lot of jobs
     priority: 90
-    constraints:
-      - operator: distinct_hosts
-        value: true
 
   # Settings for controllers
   controller:
     # Number of controler instances
     count: 1
 
+    nomad:
+      constraints:
+        - operator: distinct_hosts
+          value: true
+
     # Resource allocation for controllers
     resources:
       cpu: 100