Skip to content

pkg/types/aws/validation/platform: Include eu-north-1 #2308

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 2 commits into from
Oct 10, 2019
Merged

pkg/types/aws/validation/platform: Include eu-north-1 #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c907d53
pkg/types/aws/validation/platform: Include eu-north-1
wking Sep 3, 2019
612143d
platformtests/aws/default_instance_class_test: Add Bahrain (me-south-1)
wking Sep 3, 2019
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 @@ -10,6 +10,7 @@ var (
"ap-northeast-2": "m5",
"eu-north-1": "m5",
"eu-west-3": "m5",
"me-south-1": "m5",
"us-gov-east-1": "m5",
"us-west-2": "m5",
}
Expand Down
9 changes: 5 additions & 4 deletions pkg/types/aws/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ var (
//"cn-north-1": "Beijing",
//"cn-northwest-1": "Ningxia",
"eu-central-1": "Frankfurt",
//"eu-north-1": "Stockholm",
"eu-west-1": "Ireland",
"eu-west-2": "London",
"eu-west-3": "Paris",
"eu-north-1": "Stockholm",
"eu-west-1": "Ireland",
"eu-west-2": "London",
"eu-west-3": "Paris",
//"me-south-1": "Bahrain",
"sa-east-1": "São Paulo",
"us-east-1": "N. Virginia",
"us-east-2": "Ohio",
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/validation/installconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ func TestValidateInstallConfig(t *testing.T) {
}
return c
}(),
expectedError: `^platform\.aws\.region: Unsupported value: "": supported values: "ap-northeast-1", "ap-northeast-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"$`,
expectedError: `^platform\.aws\.region: Unsupported value: "": supported values: "ap-northeast-1", "ap-northeast-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-north-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"$`,
},
{
name: "valid libvirt platform",
Expand Down
1 change: 1 addition & 0 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 @@ -81,6 +81,7 @@ func TestGetDefaultInstanceClass(t *testing.T) {
"Asia Pacific (Hong Kong)": "ap-east-1",
"Asia Pacific (Osaka-Local)": "ap-northeast-3",
"EU (Stockholm)": "eu-north-1",
"Middle East (Bahrain)": "me-south-1",
"South America (Sao Paulo)": "sa-east-1",
}

Expand Down