From c81f8f4b218006fb14600939dfab9d0a33d58433 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 10 Dec 2018 12:18:36 -0800 Subject: [PATCH] Revert "data/aws: Switch to m4.large" This reverts commit a23037667ec332f02126ccb9b5d298c2af857c23 (data/aws: Switch to m4.large, 2018-11-29, #765), now that we've bumped our t3.medium limits in the CI and dev accounts to cover our expected loads. Moving from m4.large to t3.medium also reduces memory from 8 GiB [1] to 4 GiB [2], but after a recent run of end-to-end tests, the master consumption was: $ free -m total used free shared buff/cache available Mem: 7980 2263 794 8 4922 5259 Swap: 0 0 0 so 4 GiB should be sufficient. And it also matches our libvirt setup since e59513fc (libvirt: Add Terraform variables for memory/CPU, bump master to 4GiB, 2018-12-04, #785). [1]: https://aws.amazon.com/ec2/instance-types/#General_Purpose [2]: https://aws.amazon.com/ec2/instance-types/t3/#Product_Details --- data/data/aws/bootstrap/variables.tf | 2 +- data/data/aws/variables-aws.tf | 4 ++-- pkg/asset/machines/worker.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/data/aws/bootstrap/variables.tf b/data/data/aws/bootstrap/variables.tf index 7b394643bc7..11b23f116b5 100644 --- a/data/data/aws/bootstrap/variables.tf +++ b/data/data/aws/bootstrap/variables.tf @@ -26,7 +26,7 @@ variable "ignition" { variable "instance_type" { type = "string" - default = "m4.large" + default = "t3.medium" description = "The EC2 instance type for the bootstrap node." } diff --git a/data/data/aws/variables-aws.tf b/data/data/aws/variables-aws.tf index df672aeaff4..bd5e11a7772 100644 --- a/data/data/aws/variables-aws.tf +++ b/data/data/aws/variables-aws.tf @@ -9,10 +9,10 @@ EOF variable "aws_master_ec2_type" { type = "string" - description = "Instance size for the master node(s). Example: `m4.large`." + description = "Instance size for the master node(s). Example: `t3.medium`." # FIXME: get this wired up to the machine default - default = "m4.large" + default = "t3.medium" } variable "aws_ec2_ami_override" { diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go index bff38c09643..1050f1915eb 100644 --- a/pkg/asset/machines/worker.go +++ b/pkg/asset/machines/worker.go @@ -27,7 +27,7 @@ import ( func defaultAWSMachinePoolPlatform() awstypes.MachinePool { return awstypes.MachinePool{ - InstanceType: "m4.large", + InstanceType: "t3.medium", } }