fix: local nvme ssd count (#1937)

terraform-google-modules · May 14, 2024 · dbd90e3 · dbd90e3
1 parent d01e5bc
commit dbd90e3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -850,7 +850,7 @@ resource "google_container_node_pool" "windows_pools" {
     {% endif %}
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/cluster.tf b/cluster.tf
@@ -568,7 +568,7 @@ resource "google_container_node_pool" "pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -784,7 +784,7 @@ resource "google_container_node_pool" "windows_pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -734,7 +734,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -976,7 +976,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -659,7 +659,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -900,7 +900,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -715,7 +715,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -957,7 +957,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -640,7 +640,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -881,7 +881,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -662,7 +662,7 @@ resource "google_container_node_pool" "pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -879,7 +879,7 @@ resource "google_container_node_pool" "windows_pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -587,7 +587,7 @@ resource "google_container_node_pool" "pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }
@@ -803,7 +803,7 @@ resource "google_container_node_pool" "windows_pools" {
 
 
     dynamic "local_nvme_ssd_block_config" {
-      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
+      for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
       content {
         local_ssd_count = local_nvme_ssd_block_config.value
       }