From e9e0fd34243969f014cfc04df826e4d545b90412 Mon Sep 17 00:00:00 2001 From: Martina Iglesias Date: Thu, 13 Dec 2018 14:49:58 +0100 Subject: [PATCH] Add eu-north-1 region (Stockholm) --- pkg/ami/static_resolver_ami.go | 54 +++++++++++++++++++--------------- pkg/eks/api/api.go | 4 +++ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/pkg/ami/static_resolver_ami.go b/pkg/ami/static_resolver_ami.go index 5d61fdf210..c9511c7a3d 100644 --- a/pkg/ami/static_resolver_ami.go +++ b/pkg/ami/static_resolver_ami.go @@ -7,45 +7,51 @@ var StaticImages = map[string]map[string]map[int]map[string]string{ "1.10": { "AmazonLinux2": { ImageClassGPU: { - "eu-west-1": "ami-047637529a86c7237", - "us-east-1": "ami-03c499c67bc65c089", - "us-east-2": "ami-081210a2fd7f3c487", - "us-west-2": "ami-08754f7ac73185331", + "eu-north-1": "ami-24b43a5a", + "eu-west-1": "ami-047637529a86c7237", + "us-east-1": "ami-03c499c67bc65c089", + "us-east-2": "ami-081210a2fd7f3c487", + "us-west-2": "ami-08754f7ac73185331", }, ImageClassGeneral: { - "eu-west-1": "ami-03612357ac9da2c7d", - "us-east-1": "ami-027792c3cc6de7b5b", - "us-east-2": "ami-036130f4127a367f7", - "us-west-2": "ami-07af9511082779ae7", + "eu-north-1": "ami-04b0f84e5a05e0b30", + "eu-west-1": "ami-03612357ac9da2c7d", + "us-east-1": "ami-027792c3cc6de7b5b", + "us-east-2": "ami-036130f4127a367f7", + "us-west-2": "ami-07af9511082779ae7", }, }, "Ubuntu1804": {ImageClassGeneral: { - "eu-west-1": "ami-07036622490f7e97b", - "us-east-1": "ami-06fd8200ac0eb656d", - "us-east-2": "ami-0866798422f5d546b", - "us-west-2": "ami-6322011b", + "eu-north-1": "", + "eu-west-1": "ami-07036622490f7e97b", + "us-east-1": "ami-06fd8200ac0eb656d", + "us-east-2": "ami-0866798422f5d546b", + "us-west-2": "ami-6322011b", }}, }, "1.11": { "AmazonLinux2": { ImageClassGPU: { - "eu-west-1": "ami-050db3f5f9dbd4439", - "us-east-1": "ami-08a0bb74d1c9a5e2f", - "us-east-2": "ami-04a758678ae5ebad5", - "us-west-2": "ami-014f4e495a19d3e4f", + "eu-north-1": "ami-69b03e17", + "eu-west-1": "ami-050db3f5f9dbd4439", + "us-east-1": "ami-08a0bb74d1c9a5e2f", + "us-east-2": "ami-04a758678ae5ebad5", + "us-west-2": "ami-014f4e495a19d3e4f", }, ImageClassGeneral: { - "eu-west-1": "ami-0a9006fb385703b54", - "us-east-1": "ami-0b4eb1d8782fc3aea", - "us-east-2": "ami-053cbe66e0033ebcf", - "us-west-2": "ami-094fa4044a2a3cf52", + "eu-north-1": "ami-082e6cf1c07e60241", + "eu-west-1": "ami-0a9006fb385703b54", + "us-east-1": "ami-0b4eb1d8782fc3aea", + "us-east-2": "ami-053cbe66e0033ebcf", + "us-west-2": "ami-094fa4044a2a3cf52", }, }, "Ubuntu1804": {ImageClassGeneral: { - "eu-west-1": "", - "us-east-1": "", - "us-east-2": "", - "us-west-2": "", + "eu-north-1": "", + "eu-west-1": "", + "us-east-1": "", + "us-east-2": "", + "us-west-2": "", }}, }, } diff --git a/pkg/eks/api/api.go b/pkg/eks/api/api.go index 9a81089800..367bc50ede 100644 --- a/pkg/eks/api/api.go +++ b/pkg/eks/api/api.go @@ -26,6 +26,9 @@ const ( // EKSRegionEUWest1 represents the EU West Region Ireland EKSRegionEUWest1 = "eu-west-1" + // EKSRegionEUNorth1 represents the EU North Region Stockholm + EKSRegionEUNorth1 = "eu-north-1" + // DefaultEKSRegion defines the default region, where to deploy the EKS cluster DefaultEKSRegion = EKSRegionUSWest2 ) @@ -37,6 +40,7 @@ func SupportedRegions() []string { EKSRegionUSEast1, EKSRegionUSEast2, EKSRegionEUWest1, + EKSRegionEUNorth1, } }