fix: misspellings in comments and min_cpu_platform (#1207)

sasha-s · bharathkkb · web-flow · commit 7553a2b76045 · 2022-04-15T16:12:45.000-05:00
* propagate enable_gcfs

* move changes to autogen

* Fix misspellings in comments and min_cpu_platform

Fix misspellings in comments and inconsistent lookup
in node_config.min_cpu_platform.

Co-authored-by: Bharath KKB &lt;bharathkrishnakb@gmail.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -578,7 +578,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/autogen/safer-cluster/main.tf.tmpl b/autogen/safer-cluster/main.tf.tmpl
@@ -79,7 +79,7 @@ module "gke" {
 
   initial_node_count = var.initial_node_count
 
-  // We suggest removing the default node pull, as it cannot be modified without
+  // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
 
@@ -103,7 +103,7 @@ module "gke" {
 
   // We either:
   // - Create a dedicated service account with minimal permissions to run nodes.
-  //   All applications shuold run with an identity defined via Workload Identity anyway.
+  //   All applications should run with an identity defined via Workload Identity anyway.
   // - Use a service account passed as a parameter to the module, in case the user
   //   wants to maintain control of their service accounts.
   create_service_account = var.compute_engine_service_account == "" ? true : false
diff --git a/cluster.tf b/cluster.tf
@@ -268,7 +268,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -503,7 +503,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -417,7 +417,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -484,7 +484,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -398,7 +398,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -366,7 +366,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -281,7 +281,7 @@ resource "google_container_node_pool" "pools" {
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
-    min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
+    min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
     gcfs_config {
       enabled = lookup(each.value, "enable_gcfs", false)
     }
diff --git a/modules/safer-cluster-update-variant/main.tf b/modules/safer-cluster-update-variant/main.tf
@@ -75,7 +75,7 @@ module "gke" {
 
   initial_node_count = var.initial_node_count
 
-  // We suggest removing the default node pull, as it cannot be modified without
+  // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
 
@@ -99,7 +99,7 @@ module "gke" {
 
   // We either:
   // - Create a dedicated service account with minimal permissions to run nodes.
-  //   All applications shuold run with an identity defined via Workload Identity anyway.
+  //   All applications should run with an identity defined via Workload Identity anyway.
   // - Use a service account passed as a parameter to the module, in case the user
   //   wants to maintain control of their service accounts.
   create_service_account = var.compute_engine_service_account == "" ? true : false
diff --git a/modules/safer-cluster/main.tf b/modules/safer-cluster/main.tf
@@ -75,7 +75,7 @@ module "gke" {
 
   initial_node_count = var.initial_node_count
 
-  // We suggest removing the default node pull, as it cannot be modified without
+  // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
 
@@ -99,7 +99,7 @@ module "gke" {
 
   // We either:
   // - Create a dedicated service account with minimal permissions to run nodes.
-  //   All applications shuold run with an identity defined via Workload Identity anyway.
+  //   All applications should run with an identity defined via Workload Identity anyway.
   // - Use a service account passed as a parameter to the module, in case the user
   //   wants to maintain control of their service accounts.
   create_service_account = var.compute_engine_service_account == "" ? true : false

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ resource "google_container_node_pool" "pools" {`
`578`	`578`	`node_config {`
`579`	`579`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`580`	`580`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`581`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`581`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`582`	`582`	`gcfs_config {`
`583`	`583`	`enabled = lookup(each.value, "enable_gcfs", false)`
`584`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ resource "google_container_node_pool" "pools" {`
`268`	`268`	`node_config {`
`269`	`269`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`270`	`270`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`271`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`271`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`272`	`272`	`gcfs_config {`
`273`	`273`	`enabled = lookup(each.value, "enable_gcfs", false)`
`274`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ resource "google_container_node_pool" "pools" {`
`503`	`503`	`node_config {`
`504`	`504`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`505`	`505`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`506`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`506`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`507`	`507`	`gcfs_config {`
`508`	`508`	`enabled = lookup(each.value, "enable_gcfs", false)`
`509`	`509`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ resource "google_container_node_pool" "pools" {`
`417`	`417`	`node_config {`
`418`	`418`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`419`	`419`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`420`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`420`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`421`	`421`	`gcfs_config {`
`422`	`422`	`enabled = lookup(each.value, "enable_gcfs", false)`
`423`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ resource "google_container_node_pool" "pools" {`
`484`	`484`	`node_config {`
`485`	`485`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`486`	`486`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`487`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`487`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`488`	`488`	`gcfs_config {`
`489`	`489`	`enabled = lookup(each.value, "enable_gcfs", false)`
`490`	`490`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ resource "google_container_node_pool" "pools" {`
`398`	`398`	`node_config {`
`399`	`399`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`400`	`400`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`401`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`401`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`402`	`402`	`gcfs_config {`
`403`	`403`	`enabled = lookup(each.value, "enable_gcfs", false)`
`404`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ resource "google_container_node_pool" "pools" {`
`366`	`366`	`node_config {`
`367`	`367`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`368`	`368`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`369`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`369`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`370`	`370`	`gcfs_config {`
`371`	`371`	`enabled = lookup(each.value, "enable_gcfs", false)`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ resource "google_container_node_pool" "pools" {`
`281`	`281`	`node_config {`
`282`	`282`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
`283`	`283`	`machine_type = lookup(each.value, "machine_type", "e2-medium")`
`284`		`- min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
	`284`	`+ min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`285`	`285`	`gcfs_config {`
`286`	`286`	`enabled = lookup(each.value, "enable_gcfs", false)`
`287`	`287`	`}`