fix ranges variable

DrFaust92 · DrFaust92 · commit 1c84b6c5baba · 2025-09-25T22:46:07.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
@@ -544,8 +544,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
@@ -414,8 +414,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
@@ -315,8 +315,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
@@ -315,8 +315,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
@@ -451,8 +451,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
@@ -451,8 +451,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
@@ -451,8 +451,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
@@ -451,8 +451,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
@@ -414,8 +414,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
@@ -414,8 +414,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
`@@ -544,8 +544,8 @@ resource "google_container_cluster" "primary" {`
`544`	`544`	`dynamic "additional_ip_ranges_config" {`
`545`	`545`	`for_each = var.additional_ip_ranges_config`
`546`	`546`	`content {`
`547`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`548`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`547`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`548`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -414,8 +414,8 @@ resource "google_container_cluster" "primary" {`
`414`	`414`	`dynamic "additional_ip_ranges_config" {`
`415`	`415`	`for_each = var.additional_ip_ranges_config`
`416`	`416`	`content {`
`417`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`418`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`417`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`418`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`419`	`419`	`}`
`420`	`420`	`}`
`421`	`421`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,8 @@ resource "google_container_cluster" "primary" {`
`315`	`315`	`dynamic "additional_ip_ranges_config" {`
`316`	`316`	`for_each = var.additional_ip_ranges_config`
`317`	`317`	`content {`
`318`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`319`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`318`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`319`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`	`stack_type = var.stack_type`
Original file line number	Diff line number	Diff line change
`@@ -451,8 +451,8 @@ resource "google_container_cluster" "primary" {`
`451`	`451`	`dynamic "additional_ip_ranges_config" {`
`452`	`452`	`for_each = var.additional_ip_ranges_config`
`453`	`453`	`content {`
`454`		`- subnetwork = var.additional_ip_ranges_config.subnetwork`
`455`		`- pod_ipv4_range_names = var.additional_ip_ranges_config.pod_ipv4_range_names`
	`454`	`+ subnetwork = var.additional_ip_ranges_config.value.subnetwork`
	`455`	`+ pod_ipv4_range_names = var.additional_ip_ranges_config.value.pod_ipv4_range_names`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`	`stack_type = var.stack_type`