Skip to content

aws/defaults/platform: Default to m5 in ap-east-1 #1755

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

Merged
openshift-merge-robot merged 1 commit into from
May 22, 2019
Merged

aws/defaults/platform: Default to m5 in ap-east-1 #1755

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
1 change: 1 addition & 0 deletions pkg/types/aws/defaults/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

var (
defaultMachineClass = map[string]string{
"ap-east-1": "m5",
"eu-north-1": "m5",
"eu-west-3": "m5",
"us-gov-east-1": "m5",
Expand Down
1 change: 1 addition & 0 deletions pkg/types/aws/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var (
// the short name of the region. The value of the map is the long
// name of the region.
Regions = map[string]string{
//"ap-east-1": "Hong Kong",
"ap-northeast-1": "Tokyo",
"ap-northeast-2": "Seoul",
//"ap-northeast-3": "Osaka-Local",
Expand Down
8 changes: 6 additions & 2 deletions platformtests/aws/default_instance_class_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ func TestGetDefaultInstanceClass(t *testing.T) {
}

regions := map[string]string{ // seed with locations that don't match AWS's usual names
"South America (Sao Paulo)": "sa-east-1",
"AWS GovCloud (US)": "us-gov-west-1",
"AWS GovCloud (US)": "us-gov-west-1",
"AWS GovCloud (US-East)": "us-gov-east-1",
"Asia Pacific (Hong Kong)": "ap-east-1",
"Asia Pacific (Osaka-Local)": "ap-northeast-3",
"EU (Stockholm)": "eu-north-1",
"South America (Sao Paulo)": "sa-east-1",
}

for location, classes := range instanceClasses {
Expand Down