Fixed invalid Terraform usage of claim_name.

nullstone-modules · Mar 27, 2024 · 0c05bb7 · 0c05bb7
1 parent adb1f9d
commit 0c05bb7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.6.10 (Mar 27, 2024)
+* Fixed invalid Terraform usage of `claim_name`.
+
 # 0.6.9 (Mar 27, 2024)
 * Added support for `hostPath` volumes from capabilities.
 * Fixed syntax for `persistentVolumeClaim` in k8s deployment.

diff --git a/app.tf b/app.tf
@@ -17,6 +17,6 @@ locals {
     service_account_email = google_service_account.app.email
     service_name          = local.service_name
     service_port          = local.service_port
-    internal_subdomain   = var.port == 0 ? "" : "${local.block_name}.${local.kubernetes_namespace}.svc.cluster.local"
+    internal_subdomain    = var.port == 0 ? "" : "${local.block_name}.${local.kubernetes_namespace}.svc.cluster.local"
   })
 }
diff --git a/deployment.tf b/deployment.tf
@@ -37,7 +37,7 @@ resource "kubernetes_deployment_v1" "this" {
           for_each = local.volumes
 
           content {
-            name = volume.key
+            name = volume.value.name
 
             dynamic "empty_dir" {
               for_each = volume.value.empty_dir == null ? [] : [1]
@@ -49,7 +49,7 @@ resource "kubernetes_deployment_v1" "this" {
               iterator = pvc
 
               content {
-                claim_name = pvc.claim_name
+                claim_name = lookup(pvc, "claim_name", "")
                 read_only  = lookup(pvc, "read_only", null)
               }
             }

diff --git a/volumes.tf b/volumes.tf
@@ -13,13 +13,12 @@ locals {
     }
   }
 
-  volumes = {
-    for v in local.cap_volumes : v.name =>
-    {
+  volumes = [
+    for v in local.cap_volumes : {
       name                    = v.name
       persistent_volume_claim = jsondecode(lookup(v, "persistent_volume_claim", "null"))
       empty_dir               = jsondecode(lookup(v, "empty_dir", "null"))
       host_path               = jsondecode(lookup(v, "host_path", "null"))
     }
-  }
+  ]
 }