Cleanup

controller.nomad.hcl

@@ -2,7 +2,7 @@
 
 job "[[ .democratic_csi.instance ]]-controller" {
 
-[[- template "common/job_start.tpl" $c ]]
+[[- template "common/job_start" $c ]]
 
 [[- range $proto := slice "iscsi" "nfs" ]]
 
@@ -23,7 +23,7 @@ job "[[ .democratic_csi.instance ]]-controller" {
 
       env {
         NODE_EXTRA_CA_CERTS   = "/local/ca.crt"
-        [[ template "common/env.tpl" $c.env ]]
+        [[ template "common/env" $c.env ]]
       }
 
       vault {
@@ -68,7 +68,7 @@ _EOF
         mount_dir = "/csi"
       }
 
-[[ template "common/resources.tpl" $.democratic_csi.controller.resources ]]
+[[ template "common/resources" $.democratic_csi.controller.resources ]]
     }
   }
 [[- end ]]

node.nomad.hcl

@@ -3,7 +3,7 @@
 job "[[ .democratic_csi.instance ]]-node" {
   type        = "system"
 
-[[- template "common/job_start.tpl" $c ]]
+[[- template "common/job_start" $c ]]
 
 [[- range $proto := slice "iscsi" "nfs" ]]
 
@@ -17,17 +17,7 @@ job "[[ .democratic_csi.instance ]]-node" {
     }
 
 [[- if eq $proto "iscsi" ]]
-    volume "host_root" {
-      type      = [[ $.democratic_csi.node.volumes.host_root.type | toJSON ]]
-      read_only = false
-      source    = [[ $.democratic_csi.node.volumes.host_root.source | toJSON ]]
-    }
-
-    volume "host_run_udev" {
-      type      = [[ $.democratic_csi.node.volumes.run_udev.type | toJSON ]]
-      read_only = true
-      source    = [[ $.democratic_csi.node.volumes.run_udev.source | toJSON ]]
-    }
+  [[- template "common/volumes" $.democratic_csi.node.volumes ]]
 [[- end ]]
 
     task "[[ $proto ]]-node" {
@@ -36,7 +26,7 @@ job "[[ .democratic_csi.instance ]]-node" {
 
       env {
         CSI_NODE_ID = "${attr.unique.hostname}"
-        [[ template "common/env.tpl" $c.env ]]
+        [[ template "common/env" $c.env ]]
       }
 
       config {
@@ -87,7 +77,7 @@ _EOF
       }
 [[- end ]]
 
-[[ template "common/resources.tpl" $.democratic_csi.node.resources ]]
+[[ template "common/resources" $.democratic_csi.node.resources ]]
     }
   }
 [[- end ]]

variables.yml

@@ -87,7 +87,8 @@ democratic_csi:
       host_root:
         type: host
         source: host_root
-      run_udev:
+      host_run_udev:
         type: host
         source: host_run_udev
+        read_only: true