From 11d42a5d2105f4ae31047e2021ba974d829657a6 Mon Sep 17 00:00:00 2001
From: Jeremy Eder <jeder@redhat.com>
Date: Wed, 16 Jan 2019 17:00:49 -0500
Subject: [PATCH] update instance family from m4 to m5

---
 data/data/aws/bootstrap/variables.tf | 2 +-
 data/data/aws/variables-aws.tf       | 4 ++--
 docs/user/aws/limits.md              | 9 +++++++--
 pkg/asset/machines/master.go         | 1 +
 pkg/asset/machines/worker.go         | 5 ++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/data/data/aws/bootstrap/variables.tf b/data/data/aws/bootstrap/variables.tf
index 724d2ddf56a..f38ace38954 100644
--- a/data/data/aws/bootstrap/variables.tf
+++ b/data/data/aws/bootstrap/variables.tf
@@ -21,7 +21,7 @@ variable "ignition" {
 
 variable "instance_type" {
   type        = "string"
-  default     = "m4.large"
+  default     = "m5.large"
   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 a6a602d2d02..bc2d9b97207 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: `m5.xlarge`."
 
   # FIXME: get this wired up to the machine default
-  default = "m4.large"
+  default = "m5.xlarge"
 }
 
 variable "aws_ec2_ami_override" {
diff --git a/docs/user/aws/limits.md b/docs/user/aws/limits.md
index 3dffd3ab9aa..82512a32569 100644
--- a/docs/user/aws/limits.md
+++ b/docs/user/aws/limits.md
@@ -57,9 +57,14 @@ Each cluster creates 10 distinct security groups. The default limit of 2,500 for
 to be created.
 
 ## Instance Limits
+By default, a cluster will create:
 
-By default, a cluster will create 6 nodes (3 masters and 3 workers). Currently, these are m4.large and within a new
-account's default limit. If you intend to start with a higher number of workers, enable autoscaling and large workloads
+* One m5.large bootstrap machine (removed after install)
+* Three m5.xlarge master nodes.
+* Three m5.large worker nodes.
+
+Currently, these instance type counts are within a new account's default limit.
+If you intend to start with a higher number of workers, enable autoscaling and large workloads
 or a different instance type, please ensure you have the necessary remaining instance count within the instance type's
 limit to satisfy the need. If not, please ask AWS to increase the limit via a support case.
 
diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go
index 26f154bef56..9fb1b64f492 100644
--- a/pkg/asset/machines/master.go
+++ b/pkg/asset/machines/master.go
@@ -67,6 +67,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 	switch ic.Platform.Name() {
 	case awstypes.Name:
 		mpool := defaultAWSMachinePoolPlatform()
+		mpool.InstanceType = "m5.xlarge"
 		mpool.Set(ic.Platform.AWS.DefaultMachinePlatform)
 		mpool.Set(pool.Platform.AWS)
 		if len(mpool.Zones) == 0 {
diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go
index 67d339bb7e0..ed57d7de219 100644
--- a/pkg/asset/machines/worker.go
+++ b/pkg/asset/machines/worker.go
@@ -26,9 +26,7 @@ import (
 )
 
 func defaultAWSMachinePoolPlatform() awstypes.MachinePool {
-	return awstypes.MachinePool{
-		InstanceType: "m4.large",
-	}
+	return awstypes.MachinePool{}
 }
 
 func defaultLibvirtMachinePoolPlatform() libvirttypes.MachinePool {
@@ -94,6 +92,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 	switch ic.Platform.Name() {
 	case awstypes.Name:
 		mpool := defaultAWSMachinePoolPlatform()
+		mpool.InstanceType = "m5.large"
 		mpool.Set(ic.Platform.AWS.DefaultMachinePlatform)
 		mpool.Set(pool.Platform.AWS)
 		if len(mpool.Zones) == 0 {