feat: add location_policy and fix permadiff (#1452)

bogaertg · web-flow · commit aecccf0bb8ca · 2022-11-07T10:09:41.000-06:00
fix: location-policy permadrifting #1445
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -631,6 +631,7 @@ resource "google_container_node_pool" "windows_pools" {
     content {
       min_node_count = lookup(autoscaling.value, "min_count", 1)
       max_node_count = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/cluster.tf b/cluster.tf
@@ -331,8 +331,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -483,8 +484,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -549,8 +549,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -754,8 +755,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -458,8 +458,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -662,8 +663,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -530,8 +530,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -735,8 +736,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -439,8 +439,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -643,8 +644,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -435,8 +435,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -588,8 +589,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -344,8 +344,9 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 
@@ -496,8 +497,9 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count = lookup(autoscaling.value, "min_count", 1)
-      max_node_count = lookup(autoscaling.value, "max_count", 100)
+      min_node_count  = lookup(autoscaling.value, "min_count", 1)
+      max_node_count  = lookup(autoscaling.value, "max_count", 100)
+      location_policy = lookup(autoscaling.value, "location_policy", null)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -631,6 +631,7 @@ resource "google_container_node_pool" "windows_pools" {`
`631`	`631`	`content {`
`632`	`632`	`min_node_count = lookup(autoscaling.value, "min_count", 1)`
`633`	`633`	`max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`634`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`634`	`635`	`}`
`635`	`636`	`}`
`636`	`637`
Original file line number	Diff line number	Diff line change
`@@ -331,8 +331,9 @@ resource "google_container_node_pool" "pools" {`
`331`	`331`	`dynamic "autoscaling" {`
`332`	`332`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`333`	`333`	`content {`
`334`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`335`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`334`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`335`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`336`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`336`	`337`	`}`
`337`	`338`	`}`
`338`	`339`
`@@ -483,8 +484,9 @@ resource "google_container_node_pool" "windows_pools" {`
`483`	`484`	`dynamic "autoscaling" {`
`484`	`485`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`485`	`486`	`content {`
`486`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`487`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`487`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`488`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`489`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`488`	`490`	`}`
`489`	`491`	`}`
`490`	`492`
Original file line number	Diff line number	Diff line change
`@@ -549,8 +549,9 @@ resource "google_container_node_pool" "pools" {`
`549`	`549`	`dynamic "autoscaling" {`
`550`	`550`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`551`	`551`	`content {`
`552`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`553`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`552`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`553`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`554`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`554`	`555`	`}`
`555`	`556`	`}`
`556`	`557`
`@@ -754,8 +755,9 @@ resource "google_container_node_pool" "windows_pools" {`
`754`	`755`	`dynamic "autoscaling" {`
`755`	`756`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`756`	`757`	`content {`
`757`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`758`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`758`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`759`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`760`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`759`	`761`	`}`
`760`	`762`	`}`
`761`	`763`
Original file line number	Diff line number	Diff line change
`@@ -458,8 +458,9 @@ resource "google_container_node_pool" "pools" {`
`458`	`458`	`dynamic "autoscaling" {`
`459`	`459`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`460`	`460`	`content {`
`461`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`462`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`461`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`462`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`463`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`463`	`464`	`}`
`464`	`465`	`}`
`465`	`466`
`@@ -662,8 +663,9 @@ resource "google_container_node_pool" "windows_pools" {`
`662`	`663`	`dynamic "autoscaling" {`
`663`	`664`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`664`	`665`	`content {`
`665`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`666`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`666`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`667`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`668`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`667`	`669`	`}`
`668`	`670`	`}`
`669`	`671`
Original file line number	Diff line number	Diff line change
`@@ -530,8 +530,9 @@ resource "google_container_node_pool" "pools" {`
`530`	`530`	`dynamic "autoscaling" {`
`531`	`531`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`532`	`532`	`content {`
`533`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`534`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`533`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`534`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`535`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`535`	`536`	`}`
`536`	`537`	`}`
`537`	`538`
`@@ -735,8 +736,9 @@ resource "google_container_node_pool" "windows_pools" {`
`735`	`736`	`dynamic "autoscaling" {`
`736`	`737`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`737`	`738`	`content {`
`738`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`739`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`739`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`740`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`741`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`740`	`742`	`}`
`741`	`743`	`}`
`742`	`744`
Original file line number	Diff line number	Diff line change
`@@ -439,8 +439,9 @@ resource "google_container_node_pool" "pools" {`
`439`	`439`	`dynamic "autoscaling" {`
`440`	`440`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`441`	`441`	`content {`
`442`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`443`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`442`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`443`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`444`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`444`	`445`	`}`
`445`	`446`	`}`
`446`	`447`
`@@ -643,8 +644,9 @@ resource "google_container_node_pool" "windows_pools" {`
`643`	`644`	`dynamic "autoscaling" {`
`644`	`645`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`645`	`646`	`content {`
`646`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`647`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`647`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`648`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`649`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`648`	`650`	`}`
`649`	`651`	`}`
`650`	`652`
Original file line number	Diff line number	Diff line change
`@@ -435,8 +435,9 @@ resource "google_container_node_pool" "pools" {`
`435`	`435`	`dynamic "autoscaling" {`
`436`	`436`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`437`	`437`	`content {`
`438`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`439`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`438`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`439`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`440`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`440`	`441`	`}`
`441`	`442`	`}`
`442`	`443`
`@@ -588,8 +589,9 @@ resource "google_container_node_pool" "windows_pools" {`
`588`	`589`	`dynamic "autoscaling" {`
`589`	`590`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`590`	`591`	`content {`
`591`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`592`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`592`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`593`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`594`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`593`	`595`	`}`
`594`	`596`	`}`
`595`	`597`
Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,9 @@ resource "google_container_node_pool" "pools" {`
`344`	`344`	`dynamic "autoscaling" {`
`345`	`345`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`346`	`346`	`content {`
`347`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`348`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`347`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`348`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`349`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`349`	`350`	`}`
`350`	`351`	`}`
`351`	`352`
`@@ -496,8 +497,9 @@ resource "google_container_node_pool" "windows_pools" {`
`496`	`497`	`dynamic "autoscaling" {`
`497`	`498`	`for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []`
`498`	`499`	`content {`
`499`		`- min_node_count = lookup(autoscaling.value, "min_count", 1)`
`500`		`- max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`500`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`501`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
	`502`	`+ location_policy = lookup(autoscaling.value, "location_policy", null)`
`501`	`503`	`}`
`502`	`504`	`}`
`503`	`505`