Cleanup

controller.nomad.hcl

@@ -22,10 +22,11 @@ job "[[ .instance ]]-controller" {
       driver = "[[ $c.nomad.driver ]]"
 
       env {
-        NODE_EXTRA_CA_CERTS   = "/local/ca.crt"
-        [[ template "common/env" $c.env ]]
+        NODE_EXTRA_CA_CERTS = "/local/ca.crt"
       }
 
+[[ template "common/file_env" $c ]]
+
       vault {
         policies = ["democratic-csi[[ $c.consul.suffix ]]"]
       }

example/controller.nomad.hcl

@@ -22,12 +22,20 @@ job "democratic-csi-controller" {
 
       env {
         NODE_EXTRA_CA_CERTS = "/local/ca.crt"
-
-        LANG = "fr_FR.utf8"
-        TZ   = "Europe/Paris"
-
       }
 
+      # Use a template block instead of env {} so we can fetch values from vault
+      template {
+        data        = <<_EOT
+LANG=fr_FR.utf8
+TZ=Europe/Paris
+_EOT
+        destination = "secrets/.env"
+        perms       = 400
+        env         = true
+      }
+
+
       vault {
         policies = ["democratic-csi"]
       }
@@ -109,6 +117,7 @@ _EOF
         mount_dir = "/csi"
       }
 
+
       resources {
         cpu        = 100
         memory     = 128
@@ -135,12 +144,20 @@ _EOF
 
       env {
         NODE_EXTRA_CA_CERTS = "/local/ca.crt"
-
-        LANG = "fr_FR.utf8"
-        TZ   = "Europe/Paris"
-
       }
 
+      # Use a template block instead of env {} so we can fetch values from vault
+      template {
+        data        = <<_EOT
+LANG=fr_FR.utf8
+TZ=Europe/Paris
+_EOT
+        destination = "secrets/.env"
+        perms       = 400
+        env         = true
+      }
+
+
       vault {
         policies = ["democratic-csi"]
       }
@@ -213,6 +230,7 @@ _EOF
         mount_dir = "/csi"
       }
 
+
       resources {
         cpu        = 100
         memory     = 128

example/node.nomad.hcl

@@ -93,6 +93,7 @@ _EOF
         destination = "/run/udev"
       }
 
+
       resources {
         cpu        = 100
         memory     = 128
@@ -170,6 +171,7 @@ _EOF
         mount_dir = "/csi"
       }
 
+
       resources {
         cpu        = 100
         memory     = 128

variables.yml

@@ -5,7 +5,7 @@ instance: democratic-csi
 
 democratic_csi:
   # The Docker image to use
-  image: danielberteaud/democratic-csi:1.8.4-1
+  image: '[[ .docker.repo ]]democratic-csi:1.8.4-1'
 
   # The ID of the storage plugin (the protocol will be appended
   # Eg org.democratic-csi.iscsi and org.democratic-csi.nfs