From 98f990fea6d94d771de918214139945bbb256112 Mon Sep 17 00:00:00 2001 From: justinsb Date: Mon, 5 Sep 2022 10:23:26 -0400 Subject: [PATCH 1/2] GCE: change default control-plane instance type to e2-medium This better matches the AWS machine, which is also a burstable 2 core machine. Without this pods sometimes fail to schedule on single core machines. --- upup/pkg/fi/cloudup/populate_instancegroup_spec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index 14e73b5e04..6885959f9b 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -43,7 +43,7 @@ const ( defaultBastionMachineTypeAzure = "Standard_B2ms" defaultBastionMachineTypeHetzner = "cx11" - defaultMasterMachineTypeGCE = "n1-standard-1" + defaultMasterMachineTypeGCE = "e2-medium" defaultMasterMachineTypeDO = "s-2vcpu-4gb" defaultMasterMachineTypeAzure = "Standard_B2ms" defaultMasterMachineTypeHetzner = "cx21" From 9700d4d93421d3d6a2cd062de5798d0c48cd16a3 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 6 Sep 2022 08:34:23 +0300 Subject: [PATCH 2/2] Run hack/update-expected.sh --- .../create_cluster/gce_byo_sa/expected-v1alpha2.yaml | 2 +- .../create_cluster/ha_gce/expected-v1alpha2.yaml | 6 +++--- .../create_cluster/private_gce/expected-v1alpha2.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml index 8d4dea1fe7..7750f2917a 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -65,7 +65,7 @@ metadata: name: master-us-test1-a spec: image: ubuntu-os-cloud/ubuntu-2004-focal-v20220118 - machineType: n1-standard-1 + machineType: e2-medium maxSize: 1 minSize: 1 role: Master diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index 6c2bc8cc6e..1ab9e3e2fc 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -72,7 +72,7 @@ metadata: name: master-us-test1-a spec: image: ubuntu-os-cloud/ubuntu-2004-focal-v20220118 - machineType: n1-standard-1 + machineType: e2-medium maxSize: 1 minSize: 1 role: Master @@ -92,7 +92,7 @@ metadata: name: master-us-test1-b spec: image: ubuntu-os-cloud/ubuntu-2004-focal-v20220118 - machineType: n1-standard-1 + machineType: e2-medium maxSize: 1 minSize: 1 role: Master @@ -112,7 +112,7 @@ metadata: name: master-us-test1-c spec: image: ubuntu-os-cloud/ubuntu-2004-focal-v20220118 - machineType: n1-standard-1 + machineType: e2-medium maxSize: 1 minSize: 1 role: Master diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index 7b40a93655..c00b0b361e 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -95,7 +95,7 @@ spec: - sg-exampleid3 - sg-exampleid4 image: ubuntu-os-cloud/ubuntu-2004-focal-v20220118 - machineType: n1-standard-1 + machineType: e2-medium maxSize: 1 minSize: 1 role: Master