From 8d91938ee20d6b5ba897e3e5aa774e866f412ea1 Mon Sep 17 00:00:00 2001
From: wizzdom <wizzdom@redbrick.dcu.ie>
Date: Tue, 23 Jan 2024 04:38:58 +0000
Subject: [PATCH] add ingress node pool

---
 cluster-config/README.md                     |  5 +++++
 cluster-config/ingress-pool.hcl              |  3 +++
 jobs/games/{mc-router.hcl => gate-proxy.hcl} | 17 +++++++----------
 jobs/traefik.hcl                             |  6 +-----
 4 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 cluster-config/README.md
 create mode 100644 cluster-config/ingress-pool.hcl
 rename jobs/games/{mc-router.hcl => gate-proxy.hcl} (87%)

diff --git a/cluster-config/README.md b/cluster-config/README.md
new file mode 100644
index 0000000..cad29ad
--- /dev/null
+++ b/cluster-config/README.md
@@ -0,0 +1,5 @@
+# Nomad Cluster Configuration
+
+This directory contains configuration relating to the configuration of the cluster including:
+- node pools
+- agent config
diff --git a/cluster-config/ingress-pool.hcl b/cluster-config/ingress-pool.hcl
new file mode 100644
index 0000000..69996aa
--- /dev/null
+++ b/cluster-config/ingress-pool.hcl
@@ -0,0 +1,3 @@
+node_pool "ingress" {
+  description = "Nodes for ingress to aperture. e.g. bastion-vm"
+}
diff --git a/jobs/games/mc-router.hcl b/jobs/games/gate-proxy.hcl
similarity index 87%
rename from jobs/games/mc-router.hcl
rename to jobs/games/gate-proxy.hcl
index d18b34e..636d379 100644
--- a/jobs/games/mc-router.hcl
+++ b/jobs/games/gate-proxy.hcl
@@ -1,14 +1,9 @@
-job "mc-router" {
+job "gate-proxy" {
   datacenters = ["aperture"]
-
+  node_pool = "ingress"
   type = "service"
 
-  constraint {
-    attribute = "${attr.unique.hostname}"
-    value = "bastion-vm"
-  }
-
-  group "mc-router" {
+  group "gate-proxy" {
     count = 1
 
     network {
@@ -27,7 +22,7 @@ job "mc-router" {
       }
     }
 
-    task "webserver" {
+    task "gate-proxy" {
       driver = "docker"
 
       config {
@@ -47,9 +42,11 @@ job "mc-router" {
 config:
   bind: 0.0.0.0:4501
 
+  forwarding:
+    mode: legacy
+
   lite:
     enabled: true
-
     routes:
       - host: fugitives.rb.dcu.ie
         backend: fugitives-mc.service.consul:25566
diff --git a/jobs/traefik.hcl b/jobs/traefik.hcl
index 03ed7b1..7074f9c 100644
--- a/jobs/traefik.hcl
+++ b/jobs/traefik.hcl
@@ -1,12 +1,8 @@
 job "traefik" {
   datacenters = ["aperture"]
+  node_pool = "ingress"
   type        = "service"
 
-  constraint {
-    attribute = "${attr.unique.hostname}"
-    value = "bastion-vm"
-  }
-
   group "traefik" {
     network {
       port "http"{