Skip to content

Commit 82e25b8

Browse files
deliahudeliahu
committed
Update AWS resource metadata
1 parent 1cd5c22 commit 82e25b8

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

‎pkg/lib/aws/gen_resource_metadata.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,28 @@
1818

1919
# https://docs.aws.amazon.com/general/latest/gr/eks.html
2020
# China regions don't seem to support these endpoints (yet?)
21+
# GovCloud is skipped
2122
REGIONS = [
22-
"us-east-1", # N. Virginia
2323
"us-east-2", # Ohio
24+
"us-east-1", # N. Virginia
2425
"us-west-1", # California
2526
"us-west-2", # Oregon
27+
"af-south-1", # Cape town
28+
"ap-east-1", # Hong Kong
29+
"ap-south-1", # Mumbai
30+
"ap-northeast-2", # Seoul
31+
"ap-southeast-1", # Singapore
32+
"ap-southeast-2", # Sydney
33+
"ap-northeast-1", # Tokyo
2634
"ca-central-1", # Montreal
27-
"sa-east-1", # Sao Paulo
2835
"eu-central-1", # Frankfurt
2936
"eu-west-1", # Ireland
3037
"eu-west-2", # London
3138
"eu-south-1", # Milan
3239
"eu-west-3", # Paris
3340
"eu-north-1", # Stockholm
3441
"me-south-1", # Bahrain
35-
"af-south-1", # Cape town
36-
"ap-southeast-1", # Singapore
37-
"ap-northeast-1", # Tokyo
38-
"ap-southeast-2", # Sydney
39-
"ap-northeast-2", # Seoul
40-
"ap-south-1", # Mumbai
41-
"ap-east-1", # Hong Kong
42+
"sa-east-1", # Sao Paulo
4243
]
4344

4445
OUTPUT_FILE_NAME = "resource_metadata.go"

‎pkg/lib/aws/resource_metadata.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -777,11 +777,14 @@ var InstanceMetadatas = map[string]map[string]InstanceMetadata{
777777
"c5a.8xlarge": {Region: "ap-south-1", Type: "c5a.8xlarge", Memory: kresource.MustParse("65536Mi"), CPU: kresource.MustParse("32"), GPU: 0, Inf: 0, Price: 0.752},
778778
"c5a.large": {Region: "ap-south-1", Type: "c5a.large", Memory: kresource.MustParse("4096Mi"), CPU: kresource.MustParse("2"), GPU: 0, Inf: 0, Price: 0.047},
779779
"c5a.xlarge": {Region: "ap-south-1", Type: "c5a.xlarge", Memory: kresource.MustParse("8192Mi"), CPU: kresource.MustParse("4"), GPU: 0, Inf: 0, Price: 0.094},
780+
"c5d.12xlarge": {Region: "ap-south-1", Type: "c5d.12xlarge", Memory: kresource.MustParse("98304Mi"), CPU: kresource.MustParse("48"), GPU: 0, Inf: 0, Price: 2.376},
780781
"c5d.18xlarge": {Region: "ap-south-1", Type: "c5d.18xlarge", Memory: kresource.MustParse("147456Mi"), CPU: kresource.MustParse("72"), GPU: 0, Inf: 0, Price: 3.564},
782+
"c5d.24xlarge": {Region: "ap-south-1", Type: "c5d.24xlarge", Memory: kresource.MustParse("196608Mi"), CPU: kresource.MustParse("96"), GPU: 0, Inf: 0, Price: 4.752},
781783
"c5d.2xlarge": {Region: "ap-south-1", Type: "c5d.2xlarge", Memory: kresource.MustParse("16384Mi"), CPU: kresource.MustParse("8"), GPU: 0, Inf: 0, Price: 0.396},
782784
"c5d.4xlarge": {Region: "ap-south-1", Type: "c5d.4xlarge", Memory: kresource.MustParse("32768Mi"), CPU: kresource.MustParse("16"), GPU: 0, Inf: 0, Price: 0.792},
783785
"c5d.9xlarge": {Region: "ap-south-1", Type: "c5d.9xlarge", Memory: kresource.MustParse("73728Mi"), CPU: kresource.MustParse("36"), GPU: 0, Inf: 0, Price: 1.782},
784786
"c5d.large": {Region: "ap-south-1", Type: "c5d.large", Memory: kresource.MustParse("4096Mi"), CPU: kresource.MustParse("2"), GPU: 0, Inf: 0, Price: 0.099},
787+
"c5d.metal": {Region: "ap-south-1", Type: "c5d.metal", Memory: kresource.MustParse("196608Mi"), CPU: kresource.MustParse("96"), GPU: 0, Inf: 0, Price: 4.752},
785788
"c5d.xlarge": {Region: "ap-south-1", Type: "c5d.xlarge", Memory: kresource.MustParse("8192Mi"), CPU: kresource.MustParse("4"), GPU: 0, Inf: 0, Price: 0.198},
786789
"c5n.18xlarge": {Region: "ap-south-1", Type: "c5n.18xlarge", Memory: kresource.MustParse("196608Mi"), CPU: kresource.MustParse("72"), GPU: 0, Inf: 0, Price: 3.888},
787790
"c5n.2xlarge": {Region: "ap-south-1", Type: "c5n.2xlarge", Memory: kresource.MustParse("21504Mi"), CPU: kresource.MustParse("8"), GPU: 0, Inf: 0, Price: 0.432},
@@ -3376,6 +3379,7 @@ var InstanceMetadatas = map[string]map[string]InstanceMetadata{
33763379
"p3.2xlarge": {Region: "us-east-1", Type: "p3.2xlarge", Memory: kresource.MustParse("62464Mi"), CPU: kresource.MustParse("8"), GPU: 1, Inf: 0, Price: 3.06},
33773380
"p3.8xlarge": {Region: "us-east-1", Type: "p3.8xlarge", Memory: kresource.MustParse("249856Mi"), CPU: kresource.MustParse("32"), GPU: 4, Inf: 0, Price: 12.24},
33783381
"p3dn.24xlarge": {Region: "us-east-1", Type: "p3dn.24xlarge", Memory: kresource.MustParse("786432Mi"), CPU: kresource.MustParse("96"), GPU: 8, Inf: 0, Price: 31.212},
3382+
"p4d.24xlarge": {Region: "us-east-1", Type: "p4d.24xlarge", Memory: kresource.MustParse("1179648Mi"), CPU: kresource.MustParse("96"), GPU: 8, Inf: 0, Price: 32.7726},
33793383
"r3.2xlarge": {Region: "us-east-1", Type: "r3.2xlarge", Memory: kresource.MustParse("62464Mi"), CPU: kresource.MustParse("8"), GPU: 0, Inf: 0, Price: 0.665},
33803384
"r3.4xlarge": {Region: "us-east-1", Type: "r3.4xlarge", Memory: kresource.MustParse("124928Mi"), CPU: kresource.MustParse("16"), GPU: 0, Inf: 0, Price: 1.33},
33813385
"r3.8xlarge": {Region: "us-east-1", Type: "r3.8xlarge", Memory: kresource.MustParse("249856Mi"), CPU: kresource.MustParse("32"), GPU: 0, Inf: 0, Price: 2.66},
@@ -4259,6 +4263,7 @@ var InstanceMetadatas = map[string]map[string]InstanceMetadata{
42594263
"p3.2xlarge": {Region: "us-west-2", Type: "p3.2xlarge", Memory: kresource.MustParse("62464Mi"), CPU: kresource.MustParse("8"), GPU: 1, Inf: 0, Price: 3.06},
42604264
"p3.8xlarge": {Region: "us-west-2", Type: "p3.8xlarge", Memory: kresource.MustParse("249856Mi"), CPU: kresource.MustParse("32"), GPU: 4, Inf: 0, Price: 12.24},
42614265
"p3dn.24xlarge": {Region: "us-west-2", Type: "p3dn.24xlarge", Memory: kresource.MustParse("786432Mi"), CPU: kresource.MustParse("96"), GPU: 8, Inf: 0, Price: 31.212},
4266+
"p4d.24xlarge": {Region: "us-west-2", Type: "p4d.24xlarge", Memory: kresource.MustParse("1179648Mi"), CPU: kresource.MustParse("96"), GPU: 8, Inf: 0, Price: 32.7726},
42624267
"r3.2xlarge": {Region: "us-west-2", Type: "r3.2xlarge", Memory: kresource.MustParse("62464Mi"), CPU: kresource.MustParse("8"), GPU: 0, Inf: 0, Price: 0.665},
42634268
"r3.4xlarge": {Region: "us-west-2", Type: "r3.4xlarge", Memory: kresource.MustParse("124928Mi"), CPU: kresource.MustParse("16"), GPU: 0, Inf: 0, Price: 1.33},
42644269
"r3.8xlarge": {Region: "us-west-2", Type: "r3.8xlarge", Memory: kresource.MustParse("249856Mi"), CPU: kresource.MustParse("32"), GPU: 0, Inf: 0, Price: 2.66},
@@ -4445,14 +4450,14 @@ var EBSMetadatas = map[string]map[string]EBSMetadata{
44454450
"gp2": {Region: "ap-east-1", Type: "gp2", PriceGB: 0.132, PriceIOPS: 0, IOPSConfigurable: false},
44464451
"io1": {Region: "ap-east-1", Type: "io1", PriceGB: 0.1518, PriceIOPS: 0.0792000000, IOPSConfigurable: true},
44474452
"io2": {Region: "ap-east-1", Type: "io2", PriceGB: 0.1518, PriceIOPS: 0, IOPSConfigurable: false},
4448-
"sc1": {Region: "ap-east-1", Type: "sc1", PriceGB: 0.033, PriceIOPS: 0, IOPSConfigurable: false},
4453+
"sc1": {Region: "ap-east-1", Type: "sc1", PriceGB: 0.0198, PriceIOPS: 0, IOPSConfigurable: false},
44494454
"st1": {Region: "ap-east-1", Type: "st1", PriceGB: 0.0594, PriceIOPS: 0, IOPSConfigurable: false},
44504455
},
44514456
"ap-northeast-1": {
44524457
"gp2": {Region: "ap-northeast-1", Type: "gp2", PriceGB: 0.12, PriceIOPS: 0, IOPSConfigurable: false},
44534458
"io1": {Region: "ap-northeast-1", Type: "io1", PriceGB: 0.142, PriceIOPS: 0.0740000000, IOPSConfigurable: true},
44544459
"io2": {Region: "ap-northeast-1", Type: "io2", PriceGB: 0.142, PriceIOPS: 0, IOPSConfigurable: false},
4455-
"sc1": {Region: "ap-northeast-1", Type: "sc1", PriceGB: 0.03, PriceIOPS: 0, IOPSConfigurable: false},
4460+
"sc1": {Region: "ap-northeast-1", Type: "sc1", PriceGB: 0.018, PriceIOPS: 0, IOPSConfigurable: false},
44564461
"st1": {Region: "ap-northeast-1", Type: "st1", PriceGB: 0.054, PriceIOPS: 0, IOPSConfigurable: false},
44574462
},
44584463
"ap-northeast-2": {
@@ -4466,14 +4471,14 @@ var EBSMetadatas = map[string]map[string]EBSMetadata{
44664471
"gp2": {Region: "ap-south-1", Type: "gp2", PriceGB: 0.114, PriceIOPS: 0, IOPSConfigurable: false},
44674472
"io1": {Region: "ap-south-1", Type: "io1", PriceGB: 0.131, PriceIOPS: 0.0680000000, IOPSConfigurable: true},
44684473
"io2": {Region: "ap-south-1", Type: "io2", PriceGB: 0.131, PriceIOPS: 0, IOPSConfigurable: false},
4469-
"sc1": {Region: "ap-south-1", Type: "sc1", PriceGB: 0.029, PriceIOPS: 0, IOPSConfigurable: false},
4474+
"sc1": {Region: "ap-south-1", Type: "sc1", PriceGB: 0.0174, PriceIOPS: 0, IOPSConfigurable: false},
44704475
"st1": {Region: "ap-south-1", Type: "st1", PriceGB: 0.051, PriceIOPS: 0, IOPSConfigurable: false},
44714476
},
44724477
"ap-southeast-1": {
44734478
"gp2": {Region: "ap-southeast-1", Type: "gp2", PriceGB: 0.12, PriceIOPS: 0, IOPSConfigurable: false},
44744479
"io1": {Region: "ap-southeast-1", Type: "io1", PriceGB: 0.138, PriceIOPS: 0.0720000000, IOPSConfigurable: true},
44754480
"io2": {Region: "ap-southeast-1", Type: "io2", PriceGB: 0.138, PriceIOPS: 0, IOPSConfigurable: false},
4476-
"sc1": {Region: "ap-southeast-1", Type: "sc1", PriceGB: 0.03, PriceIOPS: 0, IOPSConfigurable: false},
4481+
"sc1": {Region: "ap-southeast-1", Type: "sc1", PriceGB: 0.018, PriceIOPS: 0, IOPSConfigurable: false},
44774482
"st1": {Region: "ap-southeast-1", Type: "st1", PriceGB: 0.054, PriceIOPS: 0, IOPSConfigurable: false},
44784483
},
44794484
"ap-southeast-2": {
@@ -4527,14 +4532,14 @@ var EBSMetadatas = map[string]map[string]EBSMetadata{
45274532
"eu-west-3": {
45284533
"gp2": {Region: "eu-west-3", Type: "gp2", PriceGB: 0.116, PriceIOPS: 0, IOPSConfigurable: false},
45294534
"io1": {Region: "eu-west-3", Type: "io1", PriceGB: 0.145, PriceIOPS: 0.0760000000, IOPSConfigurable: true},
4530-
"sc1": {Region: "eu-west-3", Type: "sc1", PriceGB: 0.029, PriceIOPS: 0, IOPSConfigurable: false},
4535+
"sc1": {Region: "eu-west-3", Type: "sc1", PriceGB: 0.0174, PriceIOPS: 0, IOPSConfigurable: false},
45314536
"st1": {Region: "eu-west-3", Type: "st1", PriceGB: 0.053, PriceIOPS: 0, IOPSConfigurable: false},
45324537
},
45334538
"me-south-1": {
45344539
"gp2": {Region: "me-south-1", Type: "gp2", PriceGB: 0.121, PriceIOPS: 0, IOPSConfigurable: false},
45354540
"io1": {Region: "me-south-1", Type: "io1", PriceGB: 0.1518, PriceIOPS: 0.0792000000, IOPSConfigurable: true},
45364541
"io2": {Region: "me-south-1", Type: "io2", PriceGB: 0.1518, PriceIOPS: 0, IOPSConfigurable: false},
4537-
"sc1": {Region: "me-south-1", Type: "sc1", PriceGB: 0.0308, PriceIOPS: 0, IOPSConfigurable: false},
4542+
"sc1": {Region: "me-south-1", Type: "sc1", PriceGB: 0.01848, PriceIOPS: 0, IOPSConfigurable: false},
45384543
"st1": {Region: "me-south-1", Type: "st1", PriceGB: 0.055, PriceIOPS: 0, IOPSConfigurable: false},
45394544
},
45404545
"sa-east-1": {
@@ -4547,7 +4552,7 @@ var EBSMetadatas = map[string]map[string]EBSMetadata{
45474552
"gp2": {Region: "us-east-1", Type: "gp2", PriceGB: 0.1, PriceIOPS: 0, IOPSConfigurable: false},
45484553
"io1": {Region: "us-east-1", Type: "io1", PriceGB: 0.125, PriceIOPS: 0.0650000000, IOPSConfigurable: true},
45494554
"io2": {Region: "us-east-1", Type: "io2", PriceGB: 0.125, PriceIOPS: 0, IOPSConfigurable: false},
4550-
"sc1": {Region: "us-east-1", Type: "sc1", PriceGB: 0.025, PriceIOPS: 0, IOPSConfigurable: false},
4555+
"sc1": {Region: "us-east-1", Type: "sc1", PriceGB: 0.015, PriceIOPS: 0, IOPSConfigurable: false},
45514556
"st1": {Region: "us-east-1", Type: "st1", PriceGB: 0.045, PriceIOPS: 0, IOPSConfigurable: false},
45524557
},
45534558
"us-east-2": {
@@ -4561,7 +4566,7 @@ var EBSMetadatas = map[string]map[string]EBSMetadata{
45614566
"gp2": {Region: "us-west-1", Type: "gp2", PriceGB: 0.12, PriceIOPS: 0, IOPSConfigurable: false},
45624567
"io1": {Region: "us-west-1", Type: "io1", PriceGB: 0.138, PriceIOPS: 0.0720000000, IOPSConfigurable: true},
45634568
"io2": {Region: "us-west-1", Type: "io2", PriceGB: 0.138, PriceIOPS: 0, IOPSConfigurable: false},
4564-
"sc1": {Region: "us-west-1", Type: "sc1", PriceGB: 0.03, PriceIOPS: 0, IOPSConfigurable: false},
4569+
"sc1": {Region: "us-west-1", Type: "sc1", PriceGB: 0.018, PriceIOPS: 0, IOPSConfigurable: false},
45654570
"st1": {Region: "us-west-1", Type: "st1", PriceGB: 0.054, PriceIOPS: 0, IOPSConfigurable: false},
45664571
},
45674572
"us-west-2": {

0 commit comments

Comments
 (0)