diff --git a/pkg/types/aws/defaults/platform.go b/pkg/types/aws/defaults/platform.go index be076c75355..74a218d0afd 100644 --- a/pkg/types/aws/defaults/platform.go +++ b/pkg/types/aws/defaults/platform.go @@ -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", } diff --git a/pkg/types/aws/validation/platform.go b/pkg/types/aws/validation/platform.go index 79adb08ee5c..271263eaba3 100644 --- a/pkg/types/aws/validation/platform.go +++ b/pkg/types/aws/validation/platform.go @@ -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", diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go index 77e768486f9..6bf4d3dd31c 100644 --- a/pkg/types/validation/installconfig_test.go +++ b/pkg/types/validation/installconfig_test.go @@ -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", diff --git a/platformtests/aws/default_instance_class_test.go b/platformtests/aws/default_instance_class_test.go index c1fbbce2eb3..365646ead84 100644 --- a/platformtests/aws/default_instance_class_test.go +++ b/platformtests/aws/default_instance_class_test.go @@ -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", }