From 117e9397a3042727e9b49c3dba9eb742769f8987 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Fri, 29 Mar 2024 21:14:24 +0100
Subject: [PATCH] switch volume to nfsv4

---
 nomad-job/csi-nfs-controler.nomad    | 2 +-
 nomad-job/csi-nfs-node.nomad         | 2 +-
 nomad-job/volume/registry-docker.hcl | 6 +++---
 nomad-job/volume/registry-ghcr.hcl   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nomad-job/csi-nfs-controler.nomad b/nomad-job/csi-nfs-controler.nomad
index 014a30f..c59f9f7 100644
--- a/nomad-job/csi-nfs-controler.nomad
+++ b/nomad-job/csi-nfs-controler.nomad
@@ -4,7 +4,7 @@ job "csi-nfs-controller" {
     task "csi-nfs-controller" {
       driver = "docker"
       config {
-        image = "registry.k8s.io/sig-storage/nfsplugin:v4.5.0"
+        image = "registry.k8s.io/sig-storage/nfsplugin:v4.6.0"
         args = [
           "--v=5",
           "--nodeid=${attr.unique.hostname}",
diff --git a/nomad-job/csi-nfs-node.nomad b/nomad-job/csi-nfs-node.nomad
index dcd4e40..067d43f 100644
--- a/nomad-job/csi-nfs-node.nomad
+++ b/nomad-job/csi-nfs-node.nomad
@@ -5,7 +5,7 @@ job "csi-nfs-nodes" {
     task "plugin" {
       driver = "docker"
       config {
-        image = "registry.k8s.io/sig-storage/nfsplugin:v4.5.0"
+        image = "registry.k8s.io/sig-storage/nfsplugin:v4.6.0"
         args = [
           "--v=5",
           "--nodeid=${attr.unique.hostname}",
diff --git a/nomad-job/volume/registry-docker.hcl b/nomad-job/volume/registry-docker.hcl
index 4c3f7c7..630230b 100644
--- a/nomad-job/volume/registry-docker.hcl
+++ b/nomad-job/volume/registry-docker.hcl
@@ -1,6 +1,7 @@
 type = "csi"
 id = "registry-docker"
 name = "registry-docker"
+external_id = "registry-docker"
 plugin_id = "nfs"
 capability {
 	access_mode = "multi-node-multi-writer"
@@ -8,10 +9,9 @@ capability {
 }
 context {
   server = "nfs.service.consul"
-  share = "/exports/nomad/registry/docker"
-  mountPermissions = "0"  
+  share = "/nomad/registry/docker"
 }
 mount_options {
   fs_type = "nfs"
-  mount_flags = [ "timeo=30", "intr", "vers=3", "_netdev" , "nolock" ]
+  mount_flags = [ "vers=4" ]
 }
diff --git a/nomad-job/volume/registry-ghcr.hcl b/nomad-job/volume/registry-ghcr.hcl
index 66540dd..702ed60 100644
--- a/nomad-job/volume/registry-ghcr.hcl
+++ b/nomad-job/volume/registry-ghcr.hcl
@@ -2,16 +2,16 @@ type = "csi"
 id = "registry-ghcr"
 name = "registry-ghcr"
 plugin_id = "nfs"
+external_id = "registry-ghcr"
 capability {
 	access_mode = "multi-node-multi-writer"
 	attachment_mode = "file-system"
 }
 context {
   server = "nfs.service.consul"
-  share = "/exports/nomad/registry/ghcr"
-  mountPermissions = "0"  
+  share = "/nomad/registry/ghcr"
 }
 mount_options {
   fs_type = "nfs"
-  mount_flags = [ "timeo=30", "intr", "vers=3", "_netdev" , "nolock" ]
+  mount_flags = [ "vers=4"]
 }