Replaces list of secondary disks with just single image

terraform-google-modules · May 16, 2024 · de7328f · de7328f
1 parent 1bac728
commit de7328f
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 45 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -856,11 +856,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/cluster.tf b/cluster.tf
@@ -574,11 +574,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -798,11 +799,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -740,11 +740,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -990,11 +991,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -665,11 +665,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -914,11 +915,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -721,11 +721,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -971,11 +972,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -646,11 +646,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -895,11 +896,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -668,11 +668,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -893,11 +894,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -593,11 +593,12 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }
 
@@ -817,11 +818,12 @@ resource "google_container_node_pool" "windows_pools" {
       }
     }
 
+    # Supports a single secondary boot disk because `map(any)` must have the same values type.
     dynamic "secondary_boot_disks" {
-      for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
+      for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
       content {
-        disk_image = secondary_boot_disks.value.disk_image
-        mode       = secondary_boot_disks.value.mode
+        disk_image = secondary_boot_disks.value.secondary_boot_disk
+        mode       = "CONTAINER_IMAGE_CACHE"
       }
     }