Skip to content

Commit

Permalink
Merge pull request #894 from weaveworks/update-amis
Browse files Browse the repository at this point in the history 
Update Amazon Linux 2 AMIs
  • Loading branch information
@errordeveloper
errordeveloper authored Jun 18, 2019
2 parents 1622c10 + bd93d35 commit 3836494
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 88 deletions.
156 changes: 78 additions & 78 deletions pkg/ami/static_resolver_ami.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
"1.10": {
"AmazonLinux2": {
ImageClassGPU: {
"ap-northeast-1": "ami-073f06a1edd22ae2e",
"ap-northeast-2": "ami-0baff950f5217e54e",
"ap-south-1": "ami-033bd2c2a3431923e",
"ap-southeast-1": "ami-09defa93988984fa1",
"ap-southeast-2": "ami-00d9364d705e902c9",
"eu-central-1": "ami-0a8536a894bd4ea06",
"eu-north-1": "ami-05baf7a6c293fe2ed",
"eu-west-1": "ami-0f6f3929a9d7a418e",
"eu-west-2": "ami-0a12396b818bc2383",
"eu-west-3": "ami-086d5edcaacd0ccfd",
"us-east-1": "ami-00f74c3728d4ca27d",
"us-east-2": "ami-0a788defb66cdfffb",
"us-west-2": "ami-0901518d7557125c8",
"ap-northeast-1": "ami-0eb16c792173d7803",
"ap-northeast-2": "ami-0ae69522fe395a7d0",
"ap-south-1": "ami-0d03d45f7645e75b0",
"ap-southeast-1": "ami-0458fc52e306065d9",
"ap-southeast-2": "ami-0c340752907861af9",
"eu-central-1": "ami-07cf4f31b9ea963f4",
"eu-north-1": "ami-09ea9a15aad35a871",
"eu-west-1": "ami-0c93eb79d0fc48e9f",
"eu-west-2": "ami-00efb6b9843c76764",
"eu-west-3": "ami-0aa7f49c7dc8bd68d",
"us-east-1": "ami-005548875cb3a3575",
"us-east-2": "ami-00bc13a7e6f7a8265",
"us-west-2": "ami-04d737b1580c9124c",
},
ImageClassGeneral: {
"ap-northeast-1": "ami-0c9fb6a3fda95d373",
"ap-northeast-2": "ami-00ea4ea959f28b4cf",
"ap-south-1": "ami-0f07478f5c5eb9e20",
"ap-southeast-1": "ami-05dac5d0ada75e22f",
"ap-southeast-2": "ami-00513f18e1900ce1e",
"eu-central-1": "ami-03bdf8079f6c013c5",
"eu-north-1": "ami-0be77fe86d741fc81",
"eu-west-1": "ami-06368da7f495b68e9",
"eu-west-2": "ami-0f1f2189b4741bc60",
"eu-west-3": "ami-03a9acb0f6e0d424d",
"us-east-1": "ami-03a1e71fb42fc37dd",
"us-east-2": "ami-093d55c2ba99ab2c8",
"us-west-2": "ami-05a71d034119ffc12",
"ap-northeast-1": "ami-0f93f5579e6e79e96",
"ap-northeast-2": "ami-0412ddfd70b9c54bd",
"ap-south-1": "ami-0a183946b284a9841",
"ap-southeast-1": "ami-0538e8e564078659c",
"ap-southeast-2": "ami-009caed75bdc3a2f0",
"eu-central-1": "ami-032fc49751b7a5f83",
"eu-north-1": "ami-0ef218c64404e4bdf",
"eu-west-1": "ami-03f9c85cd73fb9f4a",
"eu-west-2": "ami-05c9cec73d17bf97f",
"eu-west-3": "ami-0df95e4cd302d42f7",
"us-east-1": "ami-05c9fba3332ccbc43",
"us-east-2": "ami-0295a10750423107d",
"us-west-2": "ami-0fc349241eb7b1222",
},
},
"Ubuntu1804": {ImageClassGeneral: {
Expand All @@ -56,34 +56,34 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
"1.11": {
"AmazonLinux2": {
ImageClassGPU: {
"ap-northeast-1": "ami-07fc636e8f6d3e18b",
"ap-northeast-2": "ami-002057772097fcef9",
"ap-south-1": "ami-04fe7f4c75aac7196",
"ap-southeast-1": "ami-08d5da0b12751a31f",
"ap-southeast-2": "ami-04024dd8e0b9e36ff",
"eu-central-1": "ami-0bf09c13f4204ce9d",
"eu-north-1": "ami-0a1714bb5be631b59",
"eu-west-1": "ami-0b4d0f56587640d5a",
"eu-west-2": "ami-00e98f9e6fd2319e5",
"eu-west-3": "ami-0039e2556e6290828",
"us-east-1": "ami-06ec2ea207616c078",
"us-east-2": "ami-0e6993a35aae3407b",
"us-west-2": "ami-08377056d89909b2a",
"ap-northeast-1": "ami-0ba3bc3dbd7325128",
"ap-northeast-2": "ami-0731ac58838ab7de2",
"ap-south-1": "ami-082d0eed361133cbd",
"ap-southeast-1": "ami-0eac990c415d9d900",
"ap-southeast-2": "ami-0314013458ff4cc01",
"eu-central-1": "ami-0dd88826b8d30c9c2",
"eu-north-1": "ami-08e21b1774db8e2db",
"eu-west-1": "ami-0bfd7a4a4ec243d7d",
"eu-west-2": "ami-04f157495ea6b2ec4",
"eu-west-3": "ami-05c804ae583380e45",
"us-east-1": "ami-024374d07c2d6603f",
"us-east-2": "ami-0d42763da2d0f9ed7",
"us-west-2": "ami-087eb0b0b2342b023",
},
ImageClassGeneral: {
"ap-northeast-1": "ami-0d555d5f56c843803",
"ap-northeast-2": "ami-0144ae839b1111571",
"ap-south-1": "ami-02071c0110dc365ba",
"ap-southeast-1": "ami-00c91afdb73cf7f93",
"ap-southeast-2": "ami-05f4510fcfe56961c",
"eu-central-1": "ami-0c2709025eb548246",
"eu-north-1": "ami-084bd3569d08c6e67",
"eu-west-1": "ami-0e82e73403dd69fa3",
"eu-west-2": "ami-0da9aa88dd2ec8297",
"eu-west-3": "ami-099369bc73d1cc66f",
"us-east-1": "ami-02c1de421df89c58d",
"us-east-2": "ami-03b1b6cc34c010f9c",
"us-west-2": "ami-05ecac759c81e0b0c",
"ap-northeast-1": "ami-07765e1384d2e372c",
"ap-northeast-2": "ami-0656df091f27461cd",
"ap-south-1": "ami-01d152acba5840ba2",
"ap-southeast-1": "ami-084e9f3625a1a4a09",
"ap-southeast-2": "ami-03050c93b7e745696",
"eu-central-1": "ami-020f08a17c3c4251c",
"eu-north-1": "ami-0fc8c638bc80fcecf",
"eu-west-1": "ami-07d0c92a42077ec9b",
"eu-west-2": "ami-0ff8a4dc1632ee425",
"eu-west-3": "ami-0569332dde21e3f1a",
"us-east-1": "ami-053e2ac42d872cc20",
"us-east-2": "ami-088dad958fbfa643e",
"us-west-2": "ami-0743039b7c66a18f5",
},
},
"Ubuntu1804": {ImageClassGeneral: {
Expand All @@ -105,34 +105,34 @@ var StaticImages = map[string]map[string]map[int]map[string]string{
"1.12": {
"AmazonLinux2": {
ImageClassGPU: {
"ap-northeast-1": "ami-08e41cc84f4b3f27f",
"ap-northeast-2": "ami-0c43b885e33fdc29e",
"ap-south-1": "ami-0d3ecaf4f3318c714",
"ap-southeast-1": "ami-0655b4dbbe2d46703",
"ap-southeast-2": "ami-07079cd9ff1b312da",
"eu-central-1": "ami-0c57db5b204001099",
"eu-north-1": "ami-09354b076296f5946",
"eu-west-1": "ami-0fbc930681258db86",
"eu-west-2": "ami-0d832fced2cfe0f7b",
"eu-west-3": "ami-0f8fa088b406ebba2",
"us-east-1": "ami-0cb7959f92429410a",
"us-east-2": "ami-0118b61dc2312dee2",
"us-west-2": "ami-0bebf2322fd52a42e",
"ap-northeast-1": "ami-0a4c38964fd5aa49e",
"ap-northeast-2": "ami-04755a8eb51a8d931",
"ap-south-1": "ami-001b8c7e420a9f22a",
"ap-southeast-1": "ami-07d55ccb38a4b3b48",
"ap-southeast-2": "ami-06e5e549f83e73a4c",
"eu-central-1": "ami-09b34b094923f45e0",
"eu-north-1": "ami-008ea836c6efd005c",
"eu-west-1": "ami-071a5ee6f63de58a1",
"eu-west-2": "ami-06948a28c353db6b8",
"eu-west-3": "ami-047d0dd5ecf80b910",
"us-east-1": "ami-0a6076b21f3d2941d",
"us-east-2": "ami-0594af1d60a8ccc31",
"us-west-2": "ami-052c79e1fdd528e6e",
},
ImageClassGeneral: {
"ap-northeast-1": "ami-0bfedee6a7845c26d",
"ap-northeast-2": "ami-0a904348b703e620c",
"ap-south-1": "ami-09c3eb35bb3be46a4",
"ap-southeast-1": "ami-07b922b9b94d9a6d2",
"ap-southeast-2": "ami-0f0121e9e64ebd3dc",
"eu-central-1": "ami-0d741ed58ca5b342e",
"eu-north-1": "ami-0c65a309fc58f6907",
"eu-west-1": "ami-08716b70cac884aaa",
"eu-west-2": "ami-0c7388116d474ee10",
"eu-west-3": "ami-0560aea042fec8b12",
"us-east-1": "ami-0abcb9f9190e867ab",
"us-east-2": "ami-04ea7cb66af82ae4a",
"us-west-2": "ami-0923e4b35a30a5f53",
"ap-northeast-1": "ami-0dfbca8d183884f02",
"ap-northeast-2": "ami-0a9d12fe9c2a31876",
"ap-south-1": "ami-0644de45344ce867e",
"ap-southeast-1": "ami-040bdde117f3828ab",
"ap-southeast-2": "ami-01bfe815f644becc0",
"eu-central-1": "ami-09ed3f40a2b3c11f1",
"eu-north-1": "ami-022cd6a50742d611a",
"eu-west-1": "ami-091fc251b67b776c3",
"eu-west-2": "ami-0bc8d0262346bd65e",
"eu-west-3": "ami-0084dea61e480763e",
"us-east-1": "ami-0200e65a38edfb7e1",
"us-east-2": "ami-0e8d353285e26a68c",
"us-west-2": "ami-0f11fd98b02f12a4c",
},
},
"Ubuntu1804": {ImageClassGeneral: {
Expand Down
12 changes: 6 additions & 6 deletions pkg/ami/static_resolver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@ var _ = Describe("AMI Static Resolution", func() {
Version: "1.10",
InstanceType: "t2.medium",
ImageFamily: "AmazonLinux2",
ExpectedAMI: "ami-05a71d034119ffc12",
ExpectedAMI: "ami-0fc349241eb7b1222",
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-03a1e71fb42fc37dd",
ExpectedAMI: "ami-05c9fba3332ccbc43",
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-06368da7f495b68e9",
ExpectedAMI: "ami-03f9c85cd73fb9f4a",
ExpectError: false,
}),
Entry("with non-gpu instance and non-eks enabled region", ResolveCase{
Expand All @@ -69,23 +69,23 @@ var _ = Describe("AMI Static Resolution", func() {
Version: "1.10",
InstanceType: "p2.xlarge",
ImageFamily: "AmazonLinux2",
ExpectedAMI: "ami-0901518d7557125c8",
ExpectedAMI: "ami-04d737b1580c9124c",
ExpectError: false,
}),
Entry("with gpu (p3) instance and us-east-1", ResolveCase{
Region: "us-east-1",
Version: "1.10",
InstanceType: "p3.2xlarge",
ImageFamily: "AmazonLinux2",
ExpectedAMI: "ami-00f74c3728d4ca27d",
ExpectedAMI: "ami-005548875cb3a3575",
ExpectError: false,
}),
Entry("with gpu (p2) instance and eu-west-1", ResolveCase{
Region: "eu-west-1",
Version: "1.10",
InstanceType: "p2.xlarge",
ImageFamily: "AmazonLinux2",
ExpectedAMI: "ami-0f6f3929a9d7a418e",
ExpectedAMI: "ami-0c93eb79d0fc48e9f",
ExpectError: false,
}),
Entry("with gpu (p3) instance and non-eks enabled region", ResolveCase{
Expand Down
8 changes: 4 additions & 4 deletions pkg/eks/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ var _ = Describe("eksctl API", func() {
err := ctl.EnsureAMI("1.12", ng)

Expect(err).ToNot(HaveOccurred())
Expect(ng.AMI).To(Equal("ami-0bebf2322fd52a42e"))
Expect(ng.AMI).To(Equal("ami-052c79e1fdd528e6e"))
})
It("should pick a valid AMI for normal instances when AMI is static", func() {
ng.AMI = "static"
Expand All @@ -126,7 +126,7 @@ var _ = Describe("eksctl API", func() {
err := ctl.EnsureAMI("1.12", ng)

Expect(err).ToNot(HaveOccurred())
Expect(ng.AMI).To(Equal("ami-0923e4b35a30a5f53"))
Expect(ng.AMI).To(Equal("ami-0f11fd98b02f12a4c"))
})
It("should pick a valid AMI for mixed normal instances", func() {
ng.AMI = "static"
Expand All @@ -138,7 +138,7 @@ var _ = Describe("eksctl API", func() {
err := ctl.EnsureAMI("1.12", ng)

Expect(err).ToNot(HaveOccurred())
Expect(ng.AMI).To(Equal("ami-0923e4b35a30a5f53"))
Expect(ng.AMI).To(Equal("ami-0f11fd98b02f12a4c"))
})
It("should pick a GPU AMI for mixed instances with GPU instance types", func() {
ng.AMI = "static"
Expand All @@ -150,7 +150,7 @@ var _ = Describe("eksctl API", func() {
err := ctl.EnsureAMI("1.12", ng)

Expect(err).ToNot(HaveOccurred())
Expect(ng.AMI).To(Equal("ami-0bebf2322fd52a42e"))
Expect(ng.AMI).To(Equal("ami-052c79e1fdd528e6e"))
})
})
})
Expand Down

0 comments on commit 3836494

Please sign in to comment.