diff --git a/pkg/providers/instancetype/zz_generated.bandwidth.go b/pkg/providers/instancetype/zz_generated.bandwidth.go index a6b8fb5c1228..d4f684ff0c7a 100644 --- a/pkg/providers/instancetype/zz_generated.bandwidth.go +++ b/pkg/providers/instancetype/zz_generated.bandwidth.go @@ -20,56 +20,46 @@ package instancetype var ( InstanceTypeBandwidthMegabits = map[string]int64{ - // f1.2xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html - // g3.16xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html - "t2.nano": 32, + // c3.large is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // c4.4xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // i2.2xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // m2.4xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // m4.4xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // r3.large is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // t1.micro is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html + // t2.2xlarge is not available in https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html "t3.nano": 32, "t3a.nano": 32, "t4g.nano": 32, - "t2.micro": 64, "t3.micro": 64, "t3a.micro": 64, "t4g.micro": 64, - "t1.micro": 70, - "t2.small": 128, "t3.small": 128, "t3a.small": 128, "t4g.small": 128, - "t2.medium": 256, "t3.medium": 256, "t3a.medium": 256, "t4g.medium": 256, - "c1.medium": 300, - "m1.medium": 300, - "m1.small": 300, - "m2.xlarge": 300, - "m3.medium": 300, - "m4.large": 450, + "m7a.medium": 390, + "m7i-flex.large": 390, "a1.medium": 500, - "c3.large": 500, "c6g.medium": 500, "c6gd.medium": 500, "m6g.medium": 500, "m6gd.medium": 500, - "r3.large": 500, "r6g.medium": 500, "r6gd.medium": 500, "x2gd.medium": 500, - "t2.large": 512, "t3.large": 512, "t3a.large": 512, "t4g.large": 512, "c7g.medium": 520, + "c7gd.medium": 520, "m7g.medium": 520, + "m7gd.medium": 520, "r7g.medium": 520, - "c4.large": 625, + "r7gd.medium": 520, "x1e.xlarge": 625, - "c3.xlarge": 700, - "i2.xlarge": 700, - "m1.large": 700, - "m2.2xlarge": 700, - "m3.large": 700, - "r3.xlarge": 700, "a1.large": 750, "c5.large": 750, "c5a.large": 750, @@ -78,7 +68,6 @@ var ( "c6g.large": 750, "c6gd.large": 750, "i3.large": 750, - "m4.xlarge": 750, "m5.large": 750, "m5a.large": 750, "m5ad.large": 750, @@ -93,7 +82,6 @@ var ( "r5d.large": 750, "r6g.large": 750, "r6gd.large": 750, - "t2.xlarge": 750, "x2gd.large": 750, "z1d.large": 750, "c6a.large": 781, @@ -104,34 +92,28 @@ var ( "m6a.large": 781, "m6i.large": 781, "m6id.large": 781, + "m7a.large": 781, + "m7i-flex.xlarge": 781, + "m7i.large": 781, "r6a.large": 781, "r6i.large": 781, "r6id.large": 781, "c7g.large": 937, + "c7gd.large": 937, "m7g.large": 937, + "m7gd.large": 937, "r7g.large": 937, - "c1.xlarge": 1000, - "c3.2xlarge": 1000, - "i2.2xlarge": 1000, - "m1.xlarge": 1000, - "m2.4xlarge": 1000, - "m3.2xlarge": 1000, - "m3.xlarge": 1000, - "m4.2xlarge": 1000, - "r3.2xlarge": 1000, - "t2.2xlarge": 1000, + "r7gd.large": 937, "t3.xlarge": 1024, "t3a.xlarge": 1024, "t4g.xlarge": 1024, "a1.xlarge": 1250, - "c4.xlarge": 1250, "c5.xlarge": 1250, "c5a.xlarge": 1250, "c5ad.xlarge": 1250, "c5d.xlarge": 1250, "c6g.xlarge": 1250, "c6gd.xlarge": 1250, - "d2.xlarge": 1250, "g5g.xlarge": 1250, "i3.xlarge": 1250, "m5.xlarge": 1250, @@ -158,6 +140,9 @@ var ( "m6a.xlarge": 1562, "m6i.xlarge": 1562, "m6id.xlarge": 1562, + "m7a.xlarge": 1562, + "m7i-flex.2xlarge": 1562, + "m7i.xlarge": 1562, "r6a.xlarge": 1562, "r6i.xlarge": 1562, "r6id.xlarge": 1562, @@ -166,13 +151,12 @@ var ( "i4i.xlarge": 1875, "x2iedn.xlarge": 1875, "c7g.xlarge": 1876, + "c7gd.xlarge": 1876, "m7g.xlarge": 1876, + "m7gd.xlarge": 1876, "r7g.xlarge": 1876, - "c3.4xlarge": 2000, + "r7gd.xlarge": 1876, "g4ad.xlarge": 2000, - "i2.4xlarge": 2000, - "m4.4xlarge": 2000, - "r3.4xlarge": 2000, "t3.2xlarge": 2048, "t3a.2xlarge": 2048, "t4g.2xlarge": 2048, @@ -183,14 +167,13 @@ var ( "r5dn.large": 2100, "r5n.large": 2100, "a1.2xlarge": 2500, - "c4.2xlarge": 2500, "c5.2xlarge": 2500, "c5a.2xlarge": 2500, "c5ad.2xlarge": 2500, "c5d.2xlarge": 2500, "c6g.2xlarge": 2500, "c6gd.2xlarge": 2500, - "d2.2xlarge": 2500, + "f1.2xlarge": 2500, "g5.xlarge": 2500, "g5g.2xlarge": 2500, "h1.2xlarge": 2500, @@ -229,6 +212,9 @@ var ( "m6id.2xlarge": 3125, "m6idn.large": 3125, "m6in.large": 3125, + "m7a.2xlarge": 3125, + "m7i-flex.4xlarge": 3125, + "m7i.2xlarge": 3125, "r6a.2xlarge": 3125, "r6i.2xlarge": 3125, "r6id.2xlarge": 3125, @@ -236,8 +222,11 @@ var ( "r6in.large": 3125, "trn1.2xlarge": 3125, "c7g.2xlarge": 3750, + "c7gd.2xlarge": 3750, "m7g.2xlarge": 3750, + "m7gd.2xlarge": 3750, "r7g.2xlarge": 3750, + "r7gd.2xlarge": 3750, "m5dn.xlarge": 4100, "m5n.xlarge": 4100, "r5dn.xlarge": 4100, @@ -248,7 +237,6 @@ var ( "i4i.2xlarge": 4687, "a1.4xlarge": 5000, "a1.metal": 5000, - "c4.4xlarge": 5000, "c5.4xlarge": 5000, "c5a.4xlarge": 5000, "c5ad.4xlarge": 5000, @@ -256,7 +244,8 @@ var ( "c5n.xlarge": 5000, "c6g.4xlarge": 5000, "c6gd.4xlarge": 5000, - "d2.4xlarge": 5000, + "f1.4xlarge": 5000, + "g3.4xlarge": 5000, "g4dn.xlarge": 5000, "g5.2xlarge": 5000, "g5g.4xlarge": 5000, @@ -297,6 +286,9 @@ var ( "m6id.4xlarge": 6250, "m6idn.xlarge": 6250, "m6in.xlarge": 6250, + "m7a.4xlarge": 6250, + "m7i-flex.8xlarge": 6250, + "m7i.4xlarge": 6250, "r6a.4xlarge": 6250, "r6i.4xlarge": 6250, "r6id.4xlarge": 6250, @@ -305,12 +297,15 @@ var ( "vt1.6xlarge": 6250, "c6gn.xlarge": 6300, "c7g.4xlarge": 7500, + "c7gd.4xlarge": 7500, "m5a.8xlarge": 7500, "m5ad.8xlarge": 7500, "m7g.4xlarge": 7500, + "m7gd.4xlarge": 7500, "r5a.8xlarge": 7500, "r5ad.8xlarge": 7500, "r7g.4xlarge": 7500, + "r7gd.4xlarge": 7500, "m5dn.2xlarge": 8125, "m5n.2xlarge": 8125, "r5dn.2xlarge": 8125, @@ -325,6 +320,7 @@ var ( "c5ad.8xlarge": 10000, "c5n.2xlarge": 10000, "d2.8xlarge": 10000, + "g3.8xlarge": 10000, "g4dn.2xlarge": 10000, "g5.4xlarge": 10000, "h1.8xlarge": 10000, @@ -337,6 +333,8 @@ var ( "m5d.8xlarge": 10000, "m5zn.2xlarge": 10000, "mac2.metal": 10000, + "p2.8xlarge": 10000, + "p3.8xlarge": 10000, "r3.8xlarge": 10000, "r4.8xlarge": 10000, "r5.8xlarge": 10000, @@ -386,6 +384,8 @@ var ( "m6id.8xlarge": 12500, "m6idn.2xlarge": 12500, "m6in.2xlarge": 12500, + "m7a.8xlarge": 12500, + "m7i.8xlarge": 12500, "r6a.8xlarge": 12500, "r6i.8xlarge": 12500, "r6id.8xlarge": 12500, @@ -396,10 +396,13 @@ var ( "c5n.4xlarge": 15000, "c6gn.4xlarge": 15000, "c7g.8xlarge": 15000, + "c7gd.8xlarge": 15000, "g4ad.8xlarge": 15000, "m5zn.3xlarge": 15000, "m7g.8xlarge": 15000, + "m7gd.8xlarge": 15000, "r7g.8xlarge": 15000, + "r7gd.8xlarge": 15000, "x2iezn.4xlarge": 15000, "m5dn.4xlarge": 16250, "m5n.4xlarge": 16250, @@ -414,6 +417,8 @@ var ( "m6a.12xlarge": 18750, "m6i.12xlarge": 18750, "m6id.12xlarge": 18750, + "m7a.12xlarge": 18750, + "m7i.12xlarge": 18750, "r6a.12xlarge": 18750, "r6i.12xlarge": 18750, "r6id.12xlarge": 18750, @@ -439,8 +444,11 @@ var ( "r6gd.12xlarge": 20000, "x2gd.12xlarge": 20000, "c7g.12xlarge": 22500, + "c7gd.12xlarge": 22500, "m7g.12xlarge": 22500, + "m7gd.12xlarge": 22500, "r7g.12xlarge": 22500, + "r7gd.12xlarge": 22500, "c5.18xlarge": 25000, "c5.24xlarge": 25000, "c5.metal": 25000, @@ -458,6 +466,8 @@ var ( "c7gn.2xlarge": 25000, "d3.8xlarge": 25000, "d3en.4xlarge": 25000, + "f1.16xlarge": 25000, + "g3.16xlarge": 25000, "g4ad.16xlarge": 25000, "g5.16xlarge": 25000, "g5.8xlarge": 25000, @@ -486,7 +496,11 @@ var ( "m6id.16xlarge": 25000, "m6idn.4xlarge": 25000, "m6in.4xlarge": 25000, + "m7a.16xlarge": 25000, + "m7i.16xlarge": 25000, "mac1.metal": 25000, + "p2.16xlarge": 25000, + "p3.16xlarge": 25000, "r4.16xlarge": 25000, "r5.24xlarge": 25000, "r5.metal": 25000, @@ -515,10 +529,13 @@ var ( "z1d.metal": 25000, "c7g.16xlarge": 30000, "c7g.metal": 30000, + "c7gd.16xlarge": 30000, "m7g.16xlarge": 30000, "m7g.metal": 30000, + "m7gd.16xlarge": 30000, "r7g.16xlarge": 30000, "r7g.metal": 30000, + "r7gd.16xlarge": 30000, "c6a.24xlarge": 37500, "c6i.24xlarge": 37500, "c6id.24xlarge": 37500, @@ -527,6 +544,8 @@ var ( "m6a.24xlarge": 37500, "m6i.24xlarge": 37500, "m6id.24xlarge": 37500, + "m7a.24xlarge": 37500, + "m7i.24xlarge": 37500, "r6a.24xlarge": 37500, "r6i.24xlarge": 37500, "r6id.24xlarge": 37500, @@ -564,6 +583,10 @@ var ( "m6id.metal": 50000, "m6idn.8xlarge": 50000, "m6in.8xlarge": 50000, + "m7a.32xlarge": 50000, + "m7a.48xlarge": 50000, + "m7a.metal-48xl": 50000, + "m7i.48xlarge": 50000, "r5dn.12xlarge": 50000, "r5n.12xlarge": 50000, "r6a.32xlarge": 50000, @@ -659,10 +682,15 @@ var ( "r6idn.metal": 200000, "r6in.32xlarge": 200000, "r6in.metal": 200000, + "hpc7a.12xlarge": 300000, + "hpc7a.24xlarge": 300000, + "hpc7a.48xlarge": 300000, + "hpc7a.96xlarge": 300000, "dl1.24xlarge": 400000, "p4d.24xlarge": 400000, "p4de.24xlarge": 400000, "trn1.32xlarge": 800000, "trn1n.32xlarge": 1600000, + "p5.48xlarge": 3200000, } ) diff --git a/pkg/providers/pricing/zz_generated.pricing.go b/pkg/providers/pricing/zz_generated.pricing.go index b99918d1997c..66d3aff1bdd4 100644 --- a/pkg/providers/pricing/zz_generated.pricing.go +++ b/pkg/providers/pricing/zz_generated.pricing.go @@ -18,9 +18,9 @@ package pricing import "time" -// generated at 2023-08-08T13:58:38Z for us-east-1 +// generated at 2023-08-21T14:24:21Z for us-east-1 -var initialPriceUpdate, _ = time.Parse(time.RFC3339, "2023-08-08T13:58:38Z") +var initialPriceUpdate, _ = time.Parse(time.RFC3339, "2023-08-21T14:24:21Z") var initialOnDemandPrices = map[string]map[string]float64{} func init() { @@ -212,6 +212,10 @@ func init() { "m6in.12xlarge": 3.341520, "m6in.16xlarge": 4.455360, "m6in.24xlarge": 6.683040, "m6in.2xlarge": 0.556920, "m6in.32xlarge": 8.910720, "m6in.4xlarge": 1.113840, "m6in.8xlarge": 2.227680, "m6in.large": 0.139230, "m6in.metal": 8.910720, "m6in.xlarge": 0.278460, + // m7a family + "m7a.12xlarge": 2.782080, "m7a.16xlarge": 3.709440, "m7a.24xlarge": 5.564160, "m7a.2xlarge": 0.463680, + "m7a.32xlarge": 7.418880, "m7a.48xlarge": 11.128320, "m7a.4xlarge": 0.927360, "m7a.8xlarge": 1.854720, + "m7a.large": 0.115920, "m7a.medium": 0.057960, "m7a.metal-48xl": 11.128320, "m7a.xlarge": 0.231840, // m7g family "m7g.12xlarge": 1.958400, "m7g.16xlarge": 2.611200, "m7g.2xlarge": 0.326400, "m7g.4xlarge": 0.652800, "m7g.8xlarge": 1.305600, "m7g.large": 0.081600, "m7g.medium": 0.040800, "m7g.metal": 2.611200, @@ -420,6 +424,9 @@ func init() { "hpc6a.48xlarge": 3.467000, // hpc6id family "hpc6id.32xlarge": 6.854400, + // hpc7a family + "hpc7a.12xlarge": 8.667400, "hpc7a.24xlarge": 8.667400, "hpc7a.48xlarge": 8.667400, + "hpc7a.96xlarge": 8.667400, // hs1 family "hs1.8xlarge": 5.520000, // i2 family