updates to beta cluster only

g-awmalik · g-awmalik · commit 122bcd02b051 · 2022-09-07T01:44:43.000Z
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -612,6 +612,15 @@ resource "google_container_node_pool" "pools" {
     }
   }
 
+  {% if beta_cluster %}
+  dynamic "placement_policy" {
+    for_each = length(lookup(each.value, "placement_policy", "")) > 0  ? [each.value] : []
+    content {
+      type = lookup(placement_policy.value, "placement_policy", null)
+    }
+  }
+  {% endif %}
+
   {% if beta_cluster %}
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0  ? [each.value] : []
diff --git a/cluster.tf b/cluster.tf
@@ -329,6 +329,7 @@ resource "google_container_node_pool" "pools" {
   }
 
 
+
   management {
     auto_repair  = lookup(each.value, "auto_repair", true)
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -540,6 +540,13 @@ resource "google_container_node_pool" "pools" {
     }
   }
 
+  dynamic "placement_policy" {
+    for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
+    content {
+      type = lookup(placement_policy.value, "placement_policy", null)
+    }
+  }
+
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -449,6 +449,13 @@ resource "google_container_node_pool" "pools" {
     }
   }
 
+  dynamic "placement_policy" {
+    for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
+    content {
+      type = lookup(placement_policy.value, "placement_policy", null)
+    }
+  }
+
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -521,6 +521,13 @@ resource "google_container_node_pool" "pools" {
     }
   }
 
+  dynamic "placement_policy" {
+    for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
+    content {
+      type = lookup(placement_policy.value, "placement_policy", null)
+    }
+  }
+
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -430,6 +430,13 @@ resource "google_container_node_pool" "pools" {
     }
   }
 
+  dynamic "placement_policy" {
+    for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
+    content {
+      type = lookup(placement_policy.value, "placement_policy", null)
+    }
+  }
+
   dynamic "network_config" {
     for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
     content {
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -433,6 +433,7 @@ resource "google_container_node_pool" "pools" {
   }
 
 
+
   management {
     auto_repair  = lookup(each.value, "auto_repair", true)
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -342,6 +342,7 @@ resource "google_container_node_pool" "pools" {
   }
 
 
+
   management {
     auto_repair  = lookup(each.value, "auto_repair", true)
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,7 @@ resource "google_container_node_pool" "pools" {`
`329`	`329`	`}`
`330`	`330`
`331`	`331`
	`332`	`+`
`332`	`333`	`management {`
`333`	`334`	`auto_repair = lookup(each.value, "auto_repair", true)`
`334`	`335`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
Original file line number	Diff line number	Diff line change
`@@ -540,6 +540,13 @@ resource "google_container_node_pool" "pools" {`
`540`	`540`	`}`
`541`	`541`	`}`
`542`	`542`
	`543`	`+ dynamic "placement_policy" {`
	`544`	`+ for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []`
	`545`	`+ content {`
	`546`	`+ type = lookup(placement_policy.value, "placement_policy", null)`
	`547`	`+ }`
	`548`	`+ }`
	`549`	`+`
`543`	`550`	`dynamic "network_config" {`
`544`	`551`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`545`	`552`	`content {`
Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,13 @@ resource "google_container_node_pool" "pools" {`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
	`452`	`+ dynamic "placement_policy" {`
	`453`	`+ for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []`
	`454`	`+ content {`
	`455`	`+ type = lookup(placement_policy.value, "placement_policy", null)`
	`456`	`+ }`
	`457`	`+ }`
	`458`	`+`
`452`	`459`	`dynamic "network_config" {`
`453`	`460`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`454`	`461`	`content {`
Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,13 @@ resource "google_container_node_pool" "pools" {`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
	`524`	`+ dynamic "placement_policy" {`
	`525`	`+ for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []`
	`526`	`+ content {`
	`527`	`+ type = lookup(placement_policy.value, "placement_policy", null)`
	`528`	`+ }`
	`529`	`+ }`
	`530`	`+`
`524`	`531`	`dynamic "network_config" {`
`525`	`532`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`526`	`533`	`content {`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,13 @@ resource "google_container_node_pool" "pools" {`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`
	`433`	`+ dynamic "placement_policy" {`
	`434`	`+ for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []`
	`435`	`+ content {`
	`436`	`+ type = lookup(placement_policy.value, "placement_policy", null)`
	`437`	`+ }`
	`438`	`+ }`
	`439`	`+`
`433`	`440`	`dynamic "network_config" {`
`434`	`441`	`for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
`435`	`442`	`content {`
Original file line number	Diff line number	Diff line change
`@@ -433,6 +433,7 @@ resource "google_container_node_pool" "pools" {`
`433`	`433`	`}`
`434`	`434`
`435`	`435`
	`436`	`+`
`436`	`437`	`management {`
`437`	`438`	`auto_repair = lookup(each.value, "auto_repair", true)`
`438`	`439`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,7 @@ resource "google_container_node_pool" "pools" {`
`342`	`342`	`}`
`343`	`343`
`344`	`344`
	`345`	`+`
`345`	`346`	`management {`
`346`	`347`	`auto_repair = lookup(each.value, "auto_repair", true)`
`347`	`348`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`