From 1de41efafaee7abafbb6b83dc0cb687306bb4d87 Mon Sep 17 00:00:00 2001 From: Morgante Pell Date: Wed, 8 Jul 2020 22:08:30 -0400 Subject: [PATCH] feat: Changed default node pool machine type to e2-medium (#597) BREAKING CHANGE: The default machine type has been changed to `e2-medium`. If you want the old default, you should specify it explicitly: `machine_type = "n1-standard-2"`. --- README.md | 4 ++-- autogen/main/README.md | 4 ++-- autogen/main/cluster.tf.tmpl | 2 +- cluster.tf | 2 +- examples/node_pool/main.tf | 2 -- examples/node_pool_update_variant/main.tf | 1 - examples/node_pool_update_variant_beta/main.tf | 1 - examples/safer_cluster_iap_bastion/cluster.tf | 1 - examples/simple_regional_private/main.tf | 1 - modules/beta-private-cluster-update-variant/README.md | 4 ++-- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster/README.md | 4 ++-- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/README.md | 4 ++-- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster/README.md | 4 ++-- modules/beta-public-cluster/cluster.tf | 2 +- modules/private-cluster-update-variant/README.md | 4 ++-- modules/private-cluster-update-variant/cluster.tf | 2 +- modules/private-cluster/README.md | 4 ++-- modules/private-cluster/cluster.tf | 2 +- test/integration/beta_cluster/controls/gcloud.rb | 2 +- test/integration/node_pool/controls/gcloud.rb | 6 +++--- test/integration/safer_cluster/controls/gcloud.rb | 2 +- test/integration/simple_regional/controls/gcloud.rb | 2 +- test/integration/simple_regional_private/controls/gcloud.rb | 2 +- .../simple_regional_with_kubeconfig/controls/gcloud.rb | 2 +- .../simple_regional_with_networking/controls/gcloud.rb | 2 +- test/integration/simple_zonal/controls/gcloud.rb | 2 +- test/integration/simple_zonal_private/controls/gcloud.rb | 2 +- 30 files changed, 35 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index a96be47e6..baa3eca2a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" min_count = 1 max_count = 100 local_ssd_count = 0 @@ -196,7 +196,7 @@ The node_pools variable takes the following parameters: | image_type | The image type to use for this node. Note that changing the image type will delete and recreate all nodes in the node pool | COS | Optional | | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional | | name | The name of the node pool | | Required | diff --git a/autogen/main/README.md b/autogen/main/README.md index 577e598a0..4b58dc440 100644 --- a/autogen/main/README.md +++ b/autogen/main/README.md @@ -78,7 +78,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" {% if beta_cluster %} node_locations = "us-central1-b,us-central1-c" {% endif %} @@ -178,7 +178,7 @@ The node_pools variable takes the following parameters: | key | The key required for the taint | | Required | {% endif %} | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | {% if beta_cluster %} | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional | diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 8e69479c2..f1fed8114 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -426,7 +426,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/cluster.tf b/cluster.tf index 504c14024..baf044fa3 100644 --- a/cluster.tf +++ b/cluster.tf @@ -182,7 +182,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index a44750b91..4f9caf5a8 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -48,7 +48,6 @@ module "gke" { }, { name = "pool-02" - machine_type = "n1-standard-2" min_count = 1 max_count = 2 local_ssd_count = 0 @@ -65,7 +64,6 @@ module "gke" { node_locations = "${var.region}-b,${var.region}-c" autoscaling = false node_count = 2 - machine_type = "n1-standard-2" disk_type = "pd-standard" image_type = "COS" auto_upgrade = true diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index 700ea9d5f..d52df4a36 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -63,7 +63,6 @@ module "gke" { }, { name = "pool-02" - machine_type = "n1-standard-2" min_count = 1 max_count = 2 disk_size_gb = 30 diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf index cfa7957d3..e4a56f7ac 100644 --- a/examples/node_pool_update_variant_beta/main.tf +++ b/examples/node_pool_update_variant_beta/main.tf @@ -64,7 +64,6 @@ module "gke" { }, { name = "pool-02" - machine_type = "n1-standard-2" min_count = 1 max_count = 2 disk_size_gb = 30 diff --git a/examples/safer_cluster_iap_bastion/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf index 733b8a9bb..cfaa0ec86 100644 --- a/examples/safer_cluster_iap_bastion/cluster.tf +++ b/examples/safer_cluster_iap_bastion/cluster.tf @@ -35,7 +35,6 @@ module "gke" { name = "safer-pool" min_count = 1 max_count = 4 - machine_type = "n1-standard-2" auto_upgrade = true node_metadata = "GKE_METADATA_SERVER" } diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 08d8f0959..9f5c51f8d 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -50,7 +50,6 @@ module "gke" { node_pools = [ { name = "pool-01" - machine_type = "n1-standard-2" min_count = 1 max_count = 100 local_ssd_count = 0 diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md index 503312199..09bf63704 100644 --- a/modules/beta-private-cluster-update-variant/README.md +++ b/modules/beta-private-cluster-update-variant/README.md @@ -69,7 +69,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" node_locations = "us-central1-b,us-central1-c" min_count = 1 max_count = 100 @@ -279,7 +279,7 @@ The node_pools variable takes the following parameters: | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | key | The key required for the taint | | Required | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional | | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional | diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index 1a4ebae6b..86b402689 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -384,7 +384,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md index 0034f412f..ac9ff523e 100644 --- a/modules/beta-private-cluster/README.md +++ b/modules/beta-private-cluster/README.md @@ -47,7 +47,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" node_locations = "us-central1-b,us-central1-c" min_count = 1 max_count = 100 @@ -257,7 +257,7 @@ The node_pools variable takes the following parameters: | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | key | The key required for the taint | | Required | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional | | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional | diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index cbb7e4af3..bab6d001d 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -312,7 +312,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md index 7bdb0ac19..7467d5bc3 100644 --- a/modules/beta-public-cluster-update-variant/README.md +++ b/modules/beta-public-cluster-update-variant/README.md @@ -63,7 +63,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" node_locations = "us-central1-b,us-central1-c" min_count = 1 max_count = 100 @@ -267,7 +267,7 @@ The node_pools variable takes the following parameters: | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | key | The key required for the taint | | Required | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional | | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional | diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index a81f1ea93..62b284722 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -371,7 +371,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md index bb59bcd80..ec2a33e42 100644 --- a/modules/beta-public-cluster/README.md +++ b/modules/beta-public-cluster/README.md @@ -41,7 +41,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" node_locations = "us-central1-b,us-central1-c" min_count = 1 max_count = 100 @@ -245,7 +245,7 @@ The node_pools variable takes the following parameters: | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | key | The key required for the taint | | Required | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional | | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional | diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 572bc7f7c..f66045c4e 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -299,7 +299,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md index 9c2e17de7..e862f0ed9 100644 --- a/modules/private-cluster-update-variant/README.md +++ b/modules/private-cluster-update-variant/README.md @@ -66,7 +66,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" min_count = 1 max_count = 100 local_ssd_count = 0 @@ -230,7 +230,7 @@ The node_pools variable takes the following parameters: | image_type | The image type to use for this node. Note that changing the image type will delete and recreate all nodes in the node pool | COS | Optional | | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional | | name | The name of the node pool | | Required | diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index acd5185c1..9c717ba08 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -267,7 +267,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index 3b5ed6766..2f62336f5 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -44,7 +44,7 @@ module "gke" { node_pools = [ { name = "default-node-pool" - machine_type = "n1-standard-2" + machine_type = "e2-medium" min_count = 1 max_count = 100 local_ssd_count = 0 @@ -208,7 +208,7 @@ The node_pools variable takes the following parameters: | image_type | The image type to use for this node. Note that changing the image type will delete and recreate all nodes in the node pool | COS | Optional | | initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional | | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node | 0 | Optional | -| machine_type | The name of a Google Compute Engine machine type | n1-standard-2 | Optional | +| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional | | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional | | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional | | name | The name of the node pool | | Required | diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 3006a270a..235c91438 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -195,7 +195,7 @@ resource "google_container_node_pool" "pools" { node_config { image_type = lookup(each.value, "image_type", "COS") - machine_type = lookup(each.value, "machine_type", "n1-standard-2") + machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, lookup(lookup(local.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = each.value["name"] } : {}, diff --git a/test/integration/beta_cluster/controls/gcloud.rb b/test/integration/beta_cluster/controls/gcloud.rb index fc053119f..8da5e768a 100644 --- a/test/integration/beta_cluster/controls/gcloud.rb +++ b/test/integration/beta_cluster/controls/gcloud.rb @@ -148,7 +148,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb index 4291b1314..d9d305042 100644 --- a/test/integration/node_pool/controls/gcloud.rb +++ b/test/integration/node_pool/controls/gcloud.rb @@ -79,7 +79,7 @@ including( "name" => "pool-01", "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) @@ -190,7 +190,7 @@ including( "name" => "pool-02", "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) @@ -319,7 +319,7 @@ including( "name" => "pool-03", "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/safer_cluster/controls/gcloud.rb b/test/integration/safer_cluster/controls/gcloud.rb index d8ba8fb67..9b737f73a 100644 --- a/test/integration/safer_cluster/controls/gcloud.rb +++ b/test/integration/safer_cluster/controls/gcloud.rb @@ -124,7 +124,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_regional/controls/gcloud.rb b/test/integration/simple_regional/controls/gcloud.rb index 5de39ea72..bc92583e8 100644 --- a/test/integration/simple_regional/controls/gcloud.rb +++ b/test/integration/simple_regional/controls/gcloud.rb @@ -104,7 +104,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_regional_private/controls/gcloud.rb b/test/integration/simple_regional_private/controls/gcloud.rb index 13c7ece09..4d2c88e0b 100644 --- a/test/integration/simple_regional_private/controls/gcloud.rb +++ b/test/integration/simple_regional_private/controls/gcloud.rb @@ -110,7 +110,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb b/test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb index 61ba2be9e..235f0db26 100644 --- a/test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb +++ b/test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb @@ -104,7 +104,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_regional_with_networking/controls/gcloud.rb b/test/integration/simple_regional_with_networking/controls/gcloud.rb index 5de39ea72..bc92583e8 100644 --- a/test/integration/simple_regional_with_networking/controls/gcloud.rb +++ b/test/integration/simple_regional_with_networking/controls/gcloud.rb @@ -104,7 +104,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_zonal/controls/gcloud.rb b/test/integration/simple_zonal/controls/gcloud.rb index bdc691bc1..241dad44f 100644 --- a/test/integration/simple_zonal/controls/gcloud.rb +++ b/test/integration/simple_zonal/controls/gcloud.rb @@ -119,7 +119,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) ) diff --git a/test/integration/simple_zonal_private/controls/gcloud.rb b/test/integration/simple_zonal_private/controls/gcloud.rb index 804ff731d..2cba22315 100644 --- a/test/integration/simple_zonal_private/controls/gcloud.rb +++ b/test/integration/simple_zonal_private/controls/gcloud.rb @@ -110,7 +110,7 @@ expect(node_pools).to include( including( "config" => including( - "machineType" => "n1-standard-2", + "machineType" => "e2-medium", ), ) )