Merge pull request #557 from weaveworks/fix-556

Add new region: eu-west-2 (London)
eksctl-io · Feb 20, 2019 · d6e5d4f · d6e5d4f
2 parents 032f981 + 01bb2c4
commit d6e5d4f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/pkg/ami/static_resolver_ami.go b/pkg/ami/static_resolver_ami.go
@@ -14,21 +14,23 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
 				"eu-central-1":   "ami-0e24c510ebe972f26",
 				"eu-north-1":     "ami-f9810887",
 				"eu-west-1":      "ami-098171628d39d4d6c",
+				"eu-west-2":      "",
 				"us-east-1":      "ami-04c29548028d8a4a0",
 				"us-east-2":      "ami-0a6f0cc2cbef07ba9",
 				"us-west-2":      "ami-0796d47bbb4361153",
 			},
 			ImageClassGeneral: {
-				"ap-northeast-1": "ami-049090cdbc5e3c080",
-				"ap-northeast-2": "ami-0b39dee42365df927",
-				"ap-southeast-1": "ami-0a3df91af7c8225db",
-				"ap-southeast-2": "ami-0f4d387d27ad36792",
-				"eu-central-1":   "ami-074583f8d5a05e27b",
-				"eu-north-1":     "ami-0e1d5399bfbe402e0",
-				"eu-west-1":      "ami-076c1952dd7a28909",
-				"us-east-1":      "ami-0de0b13514617a168",
-				"us-east-2":      "ami-0d885462fa1a40e3a",
-				"us-west-2":      "ami-0e36fae01a5fa0d76",
+				"ap-northeast-1": "ami-0e831f9f650f2f8ab",
+				"ap-northeast-2": "ami-0378f1fac83cbf438",
+				"ap-southeast-1": "ami-0fa3f3282eb89b795",
+				"ap-southeast-2": "ami-01d0ab2e9506b8db0",
+				"eu-central-1":   "ami-0b8d223ce03e6fabc",
+				"eu-north-1":     "ami-09be5053dbb1a515d",
+				"eu-west-1":      "ami-0103822d44fc52f97",
+				"eu-west-2":      "ami-017c4d847b606e125",
+				"us-east-1":      "ami-09a7630ca9ee4ee22",
+				"us-east-2":      "ami-02a8a05e480e902e2",
+				"us-west-2":      "ami-0e7ee8863c8536cce",
 			},
 		},
 		"Ubuntu1804": {ImageClassGeneral: {
@@ -39,6 +41,7 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
 			"eu-central-1":   "ami-0734d5f3fa10dcafc",
 			"eu-north-1":     "",
 			"eu-west-1":      "ami-07036622490f7e97b",
+			"eu-west-2":      "ami-0ca3d8ce38fd258f3",
 			"us-east-1":      "ami-06fd8200ac0eb656d",
 			"us-east-2":      "ami-0866798422f5d546b",
 			"us-west-2":      "ami-6322011b",
@@ -54,21 +57,23 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
 				"eu-central-1":   "ami-0444fdaca5263be70",
 				"eu-north-1":     "ami-fe810880",
 				"eu-west-1":      "ami-03b9f52d2b707ce0a",
+				"eu-west-2":      "",
 				"us-east-1":      "ami-0a0cbb44e651c5e22",
 				"us-east-2":      "ami-08697e581e49ffecf",
 				"us-west-2":      "ami-095922d81242d0528",
 			},
 			ImageClassGeneral: {
-				"ap-northeast-1": "ami-04ef881404deec134",
-				"ap-northeast-2": "ami-0d87105164496b94b",
-				"ap-southeast-1": "ami-030c789a75c8bfbca",
-				"ap-southeast-2": "ami-0a9b90002a9a1c111",
-				"eu-central-1":   "ami-05e062a123092066a",
-				"eu-north-1":     "ami-0da59d86953d1c266",
-				"eu-west-1":      "ami-0b469c0fef0445d29",
-				"us-east-1":      "ami-0c5b63ec54dd3fc38",
-				"us-east-2":      "ami-0b10ebfc82e446296",
-				"us-west-2":      "ami-081099ec932b99961",
+				"ap-northeast-1": "ami-07fdc9272ce5b0ce5",
+				"ap-northeast-2": "ami-091e0e1906e653417",
+				"ap-southeast-1": "ami-038d55c26bf01998f",
+				"ap-southeast-2": "ami-0e07b5081bb77d540",
+				"eu-central-1":   "ami-032ed5525d4df2de3",
+				"eu-north-1":     "ami-0154b2479ba20f8bb",
+				"eu-west-1":      "ami-098fb7e9b507904e7",
+				"eu-west-2":      "ami-0d69ab00cb41d6eda",
+				"us-east-1":      "ami-0eeeef929db40543c",
+				"us-east-2":      "ami-0484545fe7d3da96f",
+				"us-west-2":      "ami-0c28139856aaf9c3b",
 			},
 		},
 		"Ubuntu1804": {ImageClassGeneral: {
@@ -79,6 +84,7 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
 			"eu-central-1":   "",
 			"eu-north-1":     "",
 			"eu-west-1":      "",
+			"eu-west-2":      "",
 			"us-east-1":      "",
 			"us-east-2":      "",
 			"us-west-2":      "",

diff --git a/pkg/ami/static_resolver_test.go b/pkg/ami/static_resolver_test.go
@@ -37,23 +37,23 @@ var _ = Describe("AMI Static Resolution", func() {
 			Version:      "1.10",
 			InstanceType: "t2.medium",
 			ImageFamily:  "AmazonLinux2",
-			ExpectedAMI:  "ami-0e36fae01a5fa0d76",
+			ExpectedAMI:  "ami-0e7ee8863c8536cce",
 			ExpectError:  false,
 		}),
 		Entry("with non-gpu instance and us-east-1", ResolveCase{
 			Region:       "us-east-1",
 			Version:      "1.10",
 			InstanceType: "t2.medium",
 			ImageFamily:  "AmazonLinux2",
-			ExpectedAMI:  "ami-0de0b13514617a168",
+			ExpectedAMI:  "ami-09a7630ca9ee4ee22",
 			ExpectError:  false,
 		}),
 		Entry("with non-gpu instance and eu-west-1", ResolveCase{
 			Region:       "eu-west-1",
 			Version:      "1.10",
 			InstanceType: "t2.medium",
 			ImageFamily:  "AmazonLinux2",
-			ExpectedAMI:  "ami-076c1952dd7a28909",
+			ExpectedAMI:  "ami-0103822d44fc52f97",
 			ExpectError:  false,
 		}),
 		Entry("with non-gpu instance and non-eks enabled region", ResolveCase{

diff --git a/pkg/apis/eksctl.io/v1alpha4/types.go b/pkg/apis/eksctl.io/v1alpha4/types.go
@@ -29,6 +29,9 @@ const (
 	// RegionEUWest1 represents the EU West Region Ireland
 	RegionEUWest1 = "eu-west-1"
 
+	// RegionEUWest2 represents the EU West Region London
+	RegionEUWest2 = "eu-west-2"
+
 	// RegionEUNorth1 represents the EU North Region Stockholm
 	RegionEUNorth1 = "eu-north-1"
 
@@ -117,6 +120,7 @@ func SupportedRegions() []string {
 		RegionUSEast1,
 		RegionUSEast2,
 		RegionEUWest1,
+		RegionEUWest2,
 		RegionEUNorth1,
 		RegionEUCentral1,
 		RegionAPNorthEast1,