From 7553a2b760455636b164c2a0cd9f06f23c8a9466 Mon Sep 17 00:00:00 2001 From: Sasha Sobol Date: Fri, 15 Apr 2022 14:12:45 -0700 Subject: [PATCH] fix: misspellings in comments and min_cpu_platform (#1207) * 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 --- autogen/main/cluster.tf.tmpl | 2 +- autogen/safer-cluster/main.tf.tmpl | 4 ++-- cluster.tf | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster/cluster.tf | 2 +- modules/private-cluster-update-variant/cluster.tf | 2 +- modules/private-cluster/cluster.tf | 2 +- modules/safer-cluster-update-variant/main.tf | 4 ++-- modules/safer-cluster/main.tf | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 6abd539edf..81f5b26367 100644 --- 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 index 519bbc286b..380199b7da 100644 --- 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 index 2e6cc659db..5951ecedc5 100644 --- 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 index ea8c36adea..c619fcf69d 100644 --- 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 index 60ce1a2c4e..a1a36a999c 100644 --- 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 index a81dbe457f..68173830ba 100644 --- 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 index a079ed7827..3d0ae442f1 100644 --- 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 index 87a45f9c21..a5eca32afc 100644 --- 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 index a6823c9383..5b8fce6f63 100644 --- 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 index f1de940e7b..26175c802b 100644 --- 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 index 8604632027..b1b497f790 100644 --- 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