From 3e69bacea5a4eba2d4bbac5763bb6c4cb0319882 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Sat, 8 Oct 2022 01:27:19 +0200
Subject: [PATCH] Make Hydra work under new system

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 nomad/regions/homelab-1/hydra.tf      | 21 ++++++++++++---------
 nomad/regions/homelab-1/job/hydra.hcl |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/nomad/regions/homelab-1/hydra.tf b/nomad/regions/homelab-1/hydra.tf
index f0df153..6ad6dc3 100644
--- a/nomad/regions/homelab-1/hydra.tf
+++ b/nomad/regions/homelab-1/hydra.tf
@@ -1,7 +1,6 @@
 resource "nomad_volume" "hydra-db" {
-  # depends_on  = [data.nomad_plugin.nomad-driver-containerd]
   type        = "csi"
-  plugin_id   = "nfs"
+  plugin_id   = "org.democratic-csi.nfs"
   volume_id   = "hydra-db"
   name        = "hydra-db"
   external_id = "hydra-db"
@@ -14,18 +13,19 @@ resource "nomad_volume" "hydra-db" {
   context = {
     server = "blowhole.hosts.in.redalder.org"
     share = "/var/nfs/hydra-db"
+    node_attach_driver = "nfs"
+    provisioner_driver = "node-manual"
   }
 
   mount_options {
     fs_type = "nfs"
-    mount_flags = [ "nolock", "hard" ]
+    mount_flags = [ "nfsvers=3", "hard", "async" ]
   }
 }
 
 resource "nomad_volume" "hydra-data" {
-  # depends_on  = [data.nomad_plugin.nomad-driver-containerd]
   type        = "csi"
-  plugin_id   = "nfs"
+  plugin_id   = "org.democratic-csi.nfs"
   volume_id   = "hydra-data"
   name        = "hydra-data"
   external_id = "hydra-data"
@@ -38,18 +38,19 @@ resource "nomad_volume" "hydra-data" {
   context = {
     server = "blowhole.hosts.in.redalder.org"
     share = "/var/nfs/hydra-data"
+    node_attach_driver = "nfs"
+    provisioner_driver = "node-manual"
   }
 
   mount_options {
     fs_type = "nfs"
-    mount_flags = [ "nolock", "hard" ]
+    mount_flags = [ "nfsvers=3", "hard", "async" ]
   }
 }
 
 resource "nomad_volume" "hydra-nix" {
-  # depends_on  = [data.nomad_plugin.nomad-driver-containerd]
   type        = "csi"
-  plugin_id   = "nfs"
+  plugin_id   = "org.democratic-csi.nfs"
   volume_id   = "hydra-nix"
   name        = "hydra-nix"
   external_id = "hydra-nix"
@@ -62,11 +63,13 @@ resource "nomad_volume" "hydra-nix" {
   context = {
     server = "blowhole.hosts.in.redalder.org"
     share = "/var/nfs/hydra-nix"
+    node_attach_driver = "nfs"
+    provisioner_driver = "node-manual"
   }
 
   mount_options {
     fs_type = "nfs"
-    mount_flags = [ "nolock", "hard" ]
+    mount_flags = [ "nfsvers=3", "hard", "async" ]
   }
 }
 
diff --git a/nomad/regions/homelab-1/job/hydra.hcl b/nomad/regions/homelab-1/job/hydra.hcl
index a903799..afef46e 100644
--- a/nomad/regions/homelab-1/job/hydra.hcl
+++ b/nomad/regions/homelab-1/job/hydra.hcl
@@ -104,8 +104,8 @@ job "hydra" {
 
       resources {
         cpu = 4000
-        memory = 1024
-        memory_max = 3072
+        memory = 4096
+        memory_max = 8096
       }
 
       template {