Merge branch 'aws:main' into main

rschalo · Jul 10, 2024 · 33f725d · 33f725d
2 parents 757ba9e + b46b685
commit 33f725d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/pkg/providers/instancetype/zz_generated.bandwidth.go b/pkg/providers/instancetype/zz_generated.bandwidth.go
@@ -103,6 +103,7 @@ var (
 		"m7gd.medium":         520,
 		"r7g.medium":          520,
 		"r7gd.medium":         520,
+		"r8g.medium":          520,
 		"x1e.xlarge":          625,
 		"a1.large":            750,
 		"c5.large":            750,
@@ -154,6 +155,7 @@ var (
 		"m7gd.large":          937,
 		"r7g.large":           937,
 		"r7gd.large":          937,
+		"r8g.large":           937,
 		"t3.xlarge":           1024,
 		"t3a.xlarge":          1024,
 		"t4g.xlarge":          1024,
@@ -212,6 +214,7 @@ var (
 		"m7gd.xlarge":         1876,
 		"r7g.xlarge":          1876,
 		"r7gd.xlarge":         1876,
+		"r8g.xlarge":          1876,
 		"g4ad.xlarge":         2000,
 		"t3.2xlarge":          2048,
 		"t3a.2xlarge":         2048,
@@ -289,6 +292,7 @@ var (
 		"m7gd.2xlarge":        3750,
 		"r7g.2xlarge":         3750,
 		"r7gd.2xlarge":        3750,
+		"r8g.2xlarge":         3750,
 		"m5dn.xlarge":         4100,
 		"m5n.xlarge":          4100,
 		"r5dn.xlarge":         4100,
@@ -373,6 +377,7 @@ var (
 		"r5ad.8xlarge":        7500,
 		"r7g.4xlarge":         7500,
 		"r7gd.4xlarge":        7500,
+		"r8g.4xlarge":         7500,
 		"m5dn.2xlarge":        8125,
 		"m5n.2xlarge":         8125,
 		"r5dn.2xlarge":        8125,
@@ -479,6 +484,7 @@ var (
 		"m7gd.8xlarge":        15000,
 		"r7g.8xlarge":         15000,
 		"r7gd.8xlarge":        15000,
+		"r8g.8xlarge":         15000,
 		"x2iezn.4xlarge":      15000,
 		"m5dn.4xlarge":        16250,
 		"m5n.4xlarge":         16250,
@@ -529,6 +535,7 @@ var (
 		"m7gd.12xlarge":       22500,
 		"r7g.12xlarge":        22500,
 		"r7gd.12xlarge":       22500,
+		"r8g.12xlarge":        22500,
 		"c5.18xlarge":         25000,
 		"c5.24xlarge":         25000,
 		"c5.metal":            25000,
@@ -631,6 +638,7 @@ var (
 		"r7g.metal":           30000,
 		"r7gd.16xlarge":       30000,
 		"r7gd.metal":          30000,
+		"r8g.16xlarge":        30000,
 		"c6a.24xlarge":        37500,
 		"c6i.24xlarge":        37500,
 		"c6id.24xlarge":       37500,
@@ -654,6 +662,8 @@ var (
 		"d3en.6xlarge":        40000,
 		"g5.12xlarge":         40000,
 		"g6.12xlarge":         40000,
+		"r8g.24xlarge":        40000,
+		"r8g.metal-24xl":      40000,
 		"c5n.9xlarge":         50000,
 		"c6a.32xlarge":        50000,
 		"c6a.48xlarge":        50000,
@@ -715,6 +725,8 @@ var (
 		"r7i.metal-48xl":      50000,
 		"r7iz.32xlarge":       50000,
 		"r7iz.metal-32xl":     50000,
+		"r8g.48xlarge":        50000,
+		"r8g.metal-48xl":      50000,
 		"u-3tb1.56xlarge":     50000,
 		"x2idn.16xlarge":      50000,
 		"x2iedn.16xlarge":     50000,

diff --git a/pkg/providers/pricing/zz_generated.pricing_aws.go b/pkg/providers/pricing/zz_generated.pricing_aws.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package pricing
 
-// generated at 2024-06-03T13:07:54Z for us-east-1
+// generated at 2024-07-10T14:30:58Z for us-east-1
 
 var InitialOnDemandPricesAWS = map[string]map[string]float64{
 	// us-east-1
@@ -334,6 +334,10 @@ var InitialOnDemandPricesAWS = map[string]map[string]float64{
 		"r7iz.12xlarge": 4.464000, "r7iz.16xlarge": 5.952000, "r7iz.2xlarge": 0.744000, "r7iz.32xlarge": 11.904000,
 		"r7iz.4xlarge": 1.488000, "r7iz.8xlarge": 2.976000, "r7iz.large": 0.186000, "r7iz.metal-16xl": 6.547200,
 		"r7iz.metal-32xl": 13.094400, "r7iz.xlarge": 0.372000,
+		// r8g family
+		"r8g.12xlarge": 2.827680, "r8g.16xlarge": 3.770240, "r8g.24xlarge": 5.655360, "r8g.2xlarge": 0.471280,
+		"r8g.48xlarge": 11.310720, "r8g.4xlarge": 0.942560, "r8g.8xlarge": 1.885120, "r8g.large": 0.117820,
+		"r8g.medium": 0.058910, "r8g.metal-24xl": 6.220900, "r8g.metal-48xl": 11.310720, "r8g.xlarge": 0.235640,
 		// t1 family
 		"t1.micro": 0.020000,
 		// t2 family

diff --git a/pkg/providers/securitygroup/securitygroup.go b/pkg/providers/securitygroup/securitygroup.go
@@ -62,11 +62,10 @@ func (p *DefaultProvider) List(ctx context.Context, nodeClass *v1beta1.EC2NodeCl
 	if err != nil {
 		return nil, err
 	}
-	if p.cm.HasChanged(fmt.Sprintf("security-groups/%s", nodeClass.Name), securityGroups) {
+	securityGroupIDs := lo.Map(securityGroups, func(s *ec2.SecurityGroup, _ int) string { return aws.StringValue(s.GroupId) })
+	if p.cm.HasChanged(fmt.Sprintf("security-groups/%s", nodeClass.Name), securityGroupIDs) {
 		log.FromContext(ctx).
-			WithValues("security-groups", lo.Map(securityGroups, func(s *ec2.SecurityGroup, _ int) string {
-				return aws.StringValue(s.GroupId)
-			})).
+			WithValues("security-groups", securityGroupIDs).
 			V(1).Info("discovered security groups")
 	}
 	return securityGroups, nil

diff --git a/pkg/providers/subnet/subnet.go b/pkg/providers/subnet/subnet.go
@@ -109,7 +109,7 @@ func (p *DefaultProvider) List(ctx context.Context, nodeClass *v1beta1.EC2NodeCl
 		}
 	}
 	p.cache.SetDefault(fmt.Sprint(hash), lo.Values(subnets))
-	if p.cm.HasChanged(fmt.Sprintf("subnets/%s", nodeClass.Name), subnets) {
+	if p.cm.HasChanged(fmt.Sprintf("subnets/%s", nodeClass.Name), lo.Keys(subnets)) {
 		log.FromContext(ctx).
 			WithValues("subnets", lo.Map(lo.Values(subnets), func(s *ec2.Subnet, _ int) v1beta1.Subnet {
 				return v1beta1.Subnet{