Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update instance family from m4 to m5 #1087

Closed
wants to merge 1 commit into from
Closed

update instance family from m4 to m5 #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/data/aws/bootstrap/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}

Expand Down
4 changes: 2 additions & 2 deletions data/data/aws/variables-aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
9 changes: 7 additions & 2 deletions docs/user/aws/limits.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions pkg/asset/machines/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions pkg/asset/machines/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ import (
)

func defaultAWSMachinePoolPlatform() awstypes.MachinePool {
return awstypes.MachinePool{
InstanceType: "m4.large",
}
return awstypes.MachinePool{}
}

func defaultLibvirtMachinePoolPlatform() libvirttypes.MachinePool {
Expand Down Expand Up @@ -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 {
Expand Down