fix: local nvme ssd count (#1937)

fl0-m · web-flow · commit dbd90e3e556d · 2024-05-14T10:45:57.000-07:00
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
       }

Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,7 @@ resource "google_container_node_pool" "windows_pools" {`
`850`	`850`	`{% endif %}`
`851`	`851`
`852`	`852`	`dynamic "local_nvme_ssd_block_config" {`
`853`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`853`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`854`	`854`	`content {`
`855`	`855`	`local_ssd_count = local_nvme_ssd_block_config.value`
`856`	`856`	`}`
Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ resource "google_container_node_pool" "pools" {`
`568`	`568`
`569`	`569`
`570`	`570`	`dynamic "local_nvme_ssd_block_config" {`
`571`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`571`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`572`	`572`	`content {`
`573`	`573`	`local_ssd_count = local_nvme_ssd_block_config.value`
`574`	`574`	`}`
`@@ -784,7 +784,7 @@ resource "google_container_node_pool" "windows_pools" {`
`784`	`784`
`785`	`785`
`786`	`786`	`dynamic "local_nvme_ssd_block_config" {`
`787`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`787`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`788`	`788`	`content {`
`789`	`789`	`local_ssd_count = local_nvme_ssd_block_config.value`
`790`	`790`	`}`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ resource "google_container_node_pool" "pools" {`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`dynamic "local_nvme_ssd_block_config" {`
`737`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`737`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`738`	`738`	`content {`
`739`	`739`	`local_ssd_count = local_nvme_ssd_block_config.value`
`740`	`740`	`}`
`@@ -976,7 +976,7 @@ resource "google_container_node_pool" "windows_pools" {`
`976`	`976`	`}`
`977`	`977`
`978`	`978`	`dynamic "local_nvme_ssd_block_config" {`
`979`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`979`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`980`	`980`	`content {`
`981`	`981`	`local_ssd_count = local_nvme_ssd_block_config.value`
`982`	`982`	`}`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ resource "google_container_node_pool" "pools" {`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`dynamic "local_nvme_ssd_block_config" {`
`662`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`662`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`663`	`663`	`content {`
`664`	`664`	`local_ssd_count = local_nvme_ssd_block_config.value`
`665`	`665`	`}`
`@@ -900,7 +900,7 @@ resource "google_container_node_pool" "windows_pools" {`
`900`	`900`	`}`
`901`	`901`
`902`	`902`	`dynamic "local_nvme_ssd_block_config" {`
`903`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`903`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`904`	`904`	`content {`
`905`	`905`	`local_ssd_count = local_nvme_ssd_block_config.value`
`906`	`906`	`}`
Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ resource "google_container_node_pool" "pools" {`
`715`	`715`	`}`
`716`	`716`
`717`	`717`	`dynamic "local_nvme_ssd_block_config" {`
`718`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`718`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`719`	`719`	`content {`
`720`	`720`	`local_ssd_count = local_nvme_ssd_block_config.value`
`721`	`721`	`}`
`@@ -957,7 +957,7 @@ resource "google_container_node_pool" "windows_pools" {`
`957`	`957`	`}`
`958`	`958`
`959`	`959`	`dynamic "local_nvme_ssd_block_config" {`
`960`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`960`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`961`	`961`	`content {`
`962`	`962`	`local_ssd_count = local_nvme_ssd_block_config.value`
`963`	`963`	`}`
Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ resource "google_container_node_pool" "pools" {`
`640`	`640`	`}`
`641`	`641`
`642`	`642`	`dynamic "local_nvme_ssd_block_config" {`
`643`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`643`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`644`	`644`	`content {`
`645`	`645`	`local_ssd_count = local_nvme_ssd_block_config.value`
`646`	`646`	`}`
`@@ -881,7 +881,7 @@ resource "google_container_node_pool" "windows_pools" {`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`dynamic "local_nvme_ssd_block_config" {`
`884`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`884`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`885`	`885`	`content {`
`886`	`886`	`local_ssd_count = local_nvme_ssd_block_config.value`
`887`	`887`	`}`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ resource "google_container_node_pool" "pools" {`
`662`	`662`
`663`	`663`
`664`	`664`	`dynamic "local_nvme_ssd_block_config" {`
`665`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`665`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`666`	`666`	`content {`
`667`	`667`	`local_ssd_count = local_nvme_ssd_block_config.value`
`668`	`668`	`}`
`@@ -879,7 +879,7 @@ resource "google_container_node_pool" "windows_pools" {`
`879`	`879`
`880`	`880`
`881`	`881`	`dynamic "local_nvme_ssd_block_config" {`
`882`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`882`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`883`	`883`	`content {`
`884`	`884`	`local_ssd_count = local_nvme_ssd_block_config.value`
`885`	`885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ resource "google_container_node_pool" "pools" {`
`587`	`587`
`588`	`588`
`589`	`589`	`dynamic "local_nvme_ssd_block_config" {`
`590`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`590`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`591`	`591`	`content {`
`592`	`592`	`local_ssd_count = local_nvme_ssd_block_config.value`
`593`	`593`	`}`
`@@ -803,7 +803,7 @@ resource "google_container_node_pool" "windows_pools" {`
`803`	`803`
`804`	`804`
`805`	`805`	`dynamic "local_nvme_ssd_block_config" {`
`806`		`- for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []`
	`806`	`+ for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []`
`807`	`807`	`content {`
`808`	`808`	`local_ssd_count = local_nvme_ssd_block_config.value`
`809`	`809`	`}`