Merge pull request openshift#1935 from abhinavdahiya/bz-1725524

 Bug 1725524: types/aws/default: move ap-northeast-2 to m5 instance class

pkg/types/aws/defaults/platform.go

@@ -6,11 +6,12 @@ import (
 
 var (
 	defaultMachineClass = map[string]string{
-		"ap-east-1":     "m5",
-		"eu-north-1":    "m5",
-		"eu-west-3":     "m5",
-		"us-gov-east-1": "m5",
-		"us-west-2":     "m5",
+		"ap-east-1":      "m5",
+		"ap-northeast-2": "m5",
+		"eu-north-1":     "m5",
+		"eu-west-3":      "m5",
+		"us-gov-east-1":  "m5",
+		"us-west-2":      "m5",
 	}
 )
 

platformtests/aws/default_instance_class_test.go

@@ -128,7 +128,7 @@ func TestGetDefaultInstanceClass(t *testing.T) {
 			}
 
 			available := make(map[string]map[string]struct{}, len(preferredInstanceClasses))
-			var match string
+			var allowed []string
 
 			for _, instanceClass := range preferredInstanceClasses {
 				if _, ok := classes[instanceClass]; !ok {
@@ -164,17 +164,16 @@ func TestGetDefaultInstanceClass(t *testing.T) {
 				}
 
 				if reflect.DeepEqual(available[instanceClass], zones) {
-					match = instanceClass
-					break
+					allowed = append(allowed, instanceClass)
 				}
 			}
 
-			if match == "" {
+			if len(allowed) == 0 {
 				t.Fatalf("none of the preferred instance classes are fully supported: %v", available)
 			}
 
 			t.Log(available)
-			assert.Equal(t, defaults.InstanceClass(region), match)
+			assert.Contains(t, allowed, defaults.InstanceClass(region))
 		})
 	}
 }