fix ranges variable

DrFaust92 · DrFaust92 · commit 7d50b793781f · 2025-10-04T10:37:02.000-04:00
Signed-off-by: drfaust92 &lt;ilia.lazebnik@gmail.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -557,8 +557,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type                    = var.stack_type
diff --git a/cluster.tf b/cluster.tf
@@ -424,8 +424,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -325,8 +325,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -325,8 +325,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -461,8 +461,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -461,8 +461,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -461,8 +461,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -461,8 +461,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -424,8 +424,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -424,8 +424,8 @@ resource "google_container_cluster" "primary" {
     dynamic "additional_ip_ranges_config" {
       for_each = var.additional_ip_ranges_config
       content {
-        subnetwork           = var.additional_ip_ranges_config.subnetwork
-        pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names
+        subnetwork           = var.additional_ip_ranges_config.value.subnetwork
+        pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names
       }
     }
     stack_type = var.stack_type

Original file line number	Diff line number	Diff line change
`@@ -557,8 +557,8 @@ resource "google_container_cluster" "primary" {`
`557`	`557`	`dynamic "additional_ip_ranges_config" {`
`558`	`558`	`for_each = var.additional_ip_ranges_config`
`559`	`559`	`content {`
`560`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`561`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`560`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`561`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -424,8 +424,8 @@ resource "google_container_cluster" "primary" {`
`424`	`424`	`dynamic "additional_ip_ranges_config" {`
`425`	`425`	`for_each = var.additional_ip_ranges_config`
`426`	`426`	`content {`
`427`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`428`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`427`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`428`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`429`	`429`	`}`
`430`	`430`	`}`
`431`	`431`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -325,8 +325,8 @@ resource "google_container_cluster" "primary" {`
`325`	`325`	`dynamic "additional_ip_ranges_config" {`
`326`	`326`	`for_each = var.additional_ip_ranges_config`
`327`	`327`	`content {`
`328`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`329`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`328`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`329`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -461,8 +461,8 @@ resource "google_container_cluster" "primary" {`
`461`	`461`	`dynamic "additional_ip_ranges_config" {`
`462`	`462`	`for_each = var.additional_ip_ranges_config`
`463`	`463`	`content {`
`464`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`465`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`464`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`465`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`	`stack_type = var.stack_type`