Merge branch 'aws:main' into main

Author: ryan-mist

pkg/providers/instancetype/zz_generated.bandwidth.go

@@ -196,6 +196,7 @@ var (
 		"x1e.2xlarge":          1250,
 		"x2gd.xlarge":          1250,
 		"z1d.xlarge":           1250,
+		"g6f.large":            1500,
 		"c6a.xlarge":           1562,
 		"c6i.xlarge":           1562,
 		"c6id.xlarge":          1562,
@@ -256,6 +257,7 @@ var (
 		"g5g.2xlarge":          2500,
 		"g6.xlarge":            2500,
 		"g6e.xlarge":           2500,
+		"g6f.xlarge":           2500,
 		"h1.2xlarge":           2500,
 		"i3.2xlarge":           2500,
 		"m5.2xlarge":           2500,
@@ -346,6 +348,7 @@ var (
 		"g5g.4xlarge":          5000,
 		"g6.2xlarge":           5000,
 		"g6e.2xlarge":          5000,
+		"g6f.2xlarge":          5000,
 		"h1.4xlarge":           5000,
 		"i3.4xlarge":           5000,
 		"inf1.2xlarge":         5000,
@@ -440,7 +443,9 @@ var (
 		"g4dn.2xlarge":         10000,
 		"g5.4xlarge":           10000,
 		"g6.4xlarge":           10000,
+		"g6f.4xlarge":          10000,
 		"gr6.4xlarge":          10000,
+		"gr6f.4xlarge":         10000,
 		"h1.8xlarge":           10000,
 		"i2.8xlarge":           10000,
 		"i3.8xlarge":           10000,

pkg/providers/pricing/zz_generated.pricing_aws.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package pricing
 
-// generated at 2025-07-28T13:21:01Z for us-east-1
+// generated at 2025-08-04T13:21:54Z for us-east-1
 
 import ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
@@ -154,8 +154,12 @@ var InitialOnDemandPricesAWS = map[string]map[ec2types.InstanceType]float64{
 		// g6e family
 		"g6e.12xlarge": 10.492640, "g6e.16xlarge": 7.577190, "g6e.24xlarge": 15.065590, "g6e.2xlarge": 2.242080,
 		"g6e.48xlarge": 30.131180, "g6e.4xlarge": 3.004240, "g6e.8xlarge": 4.528560, "g6e.xlarge": 1.861000,
+		// g6f family
+		"g6f.2xlarge": 0.475000, "g6f.4xlarge": 0.950000, "g6f.large": 0.202000, "g6f.xlarge": 0.237500,
 		// gr6 family
 		"gr6.4xlarge": 1.539200, "gr6.8xlarge": 2.446400,
+		// gr6f family
+		"gr6f.4xlarge": 1.066000,
 		// h1 family
 		"h1.16xlarge": 3.744000, "h1.2xlarge": 0.468000, "h1.4xlarge": 0.936000, "h1.8xlarge": 1.872000,
 		// hpc7g family
@@ -424,7 +428,7 @@ var InitialOnDemandPricesAWS = map[string]map[ec2types.InstanceType]float64{
 		// u-9tb1 family
 		"u-9tb1.112xlarge": 81.900000,
 		// u7i-12tb family
-		"u7i-12tb.224xlarge": 135.227750,
+		"u7i-12tb.224xlarge": 125.581820,
 		// u7i-6tb family
 		"u7i-6tb.112xlarge": 62.790000,
 		// u7i-8tb family

test/suites/integration/extended_resources_test.go

@@ -72,6 +72,13 @@ var _ = Describe("Extended Resources", func() {
 				Operator: corev1.NodeSelectorOpExists,
 			},
 		})
+		test.ReplaceRequirements(nodePool, karpv1.NodeSelectorRequirementWithMinValues{
+			NodeSelectorRequirement: corev1.NodeSelectorRequirement{
+				Key:      v1.LabelInstanceFamily,
+				Operator: corev1.NodeSelectorOpNotIn,
+				Values:   []string{"g6f"},
+			},
+		})
 		env.ExpectCreated(nodeClass, nodePool, dep)
 		env.EventuallyExpectHealthyPodCount(selector, numPods)
 		env.ExpectCreatedNodeCount("==", 1)
@@ -103,6 +110,13 @@ var _ = Describe("Extended Resources", func() {
 				Key:      v1.LabelInstanceCategory,
 				Operator: corev1.NodeSelectorOpExists,
 			}})
+		test.ReplaceRequirements(nodePool, karpv1.NodeSelectorRequirementWithMinValues{
+			NodeSelectorRequirement: corev1.NodeSelectorRequirement{
+				Key:      v1.LabelInstanceFamily,
+				Operator: corev1.NodeSelectorOpNotIn,
+				Values:   []string{"g6f"},
+			},
+		})
 		env.ExpectCreated(nodeClass, nodePool, dep)
 		env.EventuallyExpectHealthyPodCount(selector, numPods)
 		env.ExpectCreatedNodeCount("==", 1)