tf: Replace deprecated nomad_volume (#206)

femiwiki · Mar 1, 2024 · 80dde5d · 80dde5d
1 parent 3122e6f
commit 80dde5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/terraform/mediawiki.tf b/terraform/mediawiki.tf
@@ -1,7 +1,7 @@
 resource "nomad_job" "mysql" {
   depends_on = [
     data.nomad_plugin.ebs,
-    nomad_volume.mysql,
+    nomad_csi_volume_registration.mysql,
   ]
 
   jobspec = file("../jobs/mysql.nomad")
@@ -38,7 +38,7 @@ resource "nomad_job" "fastcgi" {
 resource "nomad_job" "http" {
   depends_on = [
     data.nomad_plugin.ebs,
-    nomad_volume.caddycerts,
+    nomad_csi_volume_registration.caddycerts,
   ]
 
   jobspec = file("../jobs/http.nomad")

diff --git a/terraform/volumes.tf b/terraform/volumes.tf
@@ -19,9 +19,12 @@ data "nomad_plugin" "ebs" {
   wait_for_healthy = true
 }
 
-resource "nomad_volume" "mysql" {
+import {
+  id = "mysql@default"
+  to = nomad_csi_volume_registration.mysql
+}
+resource "nomad_csi_volume_registration" "mysql" {
   depends_on  = [data.nomad_plugin.ebs]
-  type        = "csi"
   plugin_id   = "aws-ebs0"
   volume_id   = "mysql"
   name        = "mysql"
@@ -33,9 +36,12 @@ resource "nomad_volume" "mysql" {
   }
 }
 
-resource "nomad_volume" "caddycerts" {
+import {
+  id = "caddycerts@default"
+  to = nomad_csi_volume_registration.caddycerts
+}
+resource "nomad_csi_volume_registration" "caddycerts" {
   depends_on  = [data.nomad_plugin.ebs]
-  type        = "csi"
   plugin_id   = "aws-ebs0"
   volume_id   = "caddycerts"
   name        = "caddycerts"