Rename the Requirements method to Compatible in Offerings.

aws · Jan 6, 2024 · 7faf746 · 7faf746
1 parent 93edef3
commit 7faf746
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -240,7 +240,7 @@ func (c *CloudProvider) resolveInstanceTypes(ctx context.Context, nodeClaim *cor
 	reqs := scheduling.NewNodeSelectorRequirements(nodeClaim.Spec.Requirements...)
 	return lo.Filter(instanceTypes, func(i *cloudprovider.InstanceType, _ int) bool {
 		return reqs.Compatible(i.Requirements, scheduling.AllowUndefinedWellKnownLabels) == nil &&
-			len(i.Offerings.Requirements(reqs).Available()) > 0 &&
+			len(i.Offerings.Compatible(reqs).Available()) > 0 &&
 			resources.Fits(nodeClaim.Spec.Resources.Requests, i.Allocatable())
 	}), nil
 }

diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go
@@ -374,11 +374,11 @@ func orderInstanceTypesByPrice(instanceTypes []*cloudprovider.InstanceType, requ
 	sort.Slice(instanceTypes, func(i, j int) bool {
 		iPrice := math.MaxFloat64
 		jPrice := math.MaxFloat64
-		if len(instanceTypes[i].Offerings.Available().Requirements(requirements)) > 0 {
-			iPrice = instanceTypes[i].Offerings.Available().Requirements(requirements).Cheapest().Price
+		if len(instanceTypes[i].Offerings.Available().Compatible(requirements)) > 0 {
+			iPrice = instanceTypes[i].Offerings.Available().Compatible(requirements).Cheapest().Price
 		}
-		if len(instanceTypes[j].Offerings.Available().Requirements(requirements)) > 0 {
-			jPrice = instanceTypes[j].Offerings.Available().Requirements(requirements).Cheapest().Price
+		if len(instanceTypes[j].Offerings.Available().Compatible(requirements)) > 0 {
+			jPrice = instanceTypes[j].Offerings.Available().Compatible(requirements).Cheapest().Price
 		}
 		if iPrice == jPrice {
 			return instanceTypes[i].Name < instanceTypes[j].Name

diff --git a/pkg/providers/instancetype/suite_test.go b/pkg/providers/instancetype/suite_test.go
@@ -339,8 +339,8 @@ var _ = Describe("InstanceTypes", func() {
 		// We need some way to deterministically order them if their prices match
 		reqs := scheduling.NewNodeSelectorRequirements(nodePool.Spec.Template.Spec.Requirements...)
 		sort.Slice(its, func(i, j int) bool {
-			iPrice := its[i].Offerings.Requirements(reqs).Cheapest().Price
-			jPrice := its[j].Offerings.Requirements(reqs).Cheapest().Price
+			iPrice := its[i].Offerings.Compatible(reqs).Cheapest().Price
+			jPrice := its[j].Offerings.Compatible(reqs).Cheapest().Price
 			if iPrice == jPrice {
 				return its[i].Name < its[j].Name
 			}
@@ -397,8 +397,8 @@ var _ = Describe("InstanceTypes", func() {
 		// We need some way to deterministically order them if their prices match
 		reqs := scheduling.NewNodeSelectorRequirements(nodePool.Spec.Template.Spec.Requirements...)
 		sort.Slice(its, func(i, j int) bool {
-			iPrice := its[i].Offerings.Requirements(reqs).Cheapest().Price
-			jPrice := its[j].Offerings.Requirements(reqs).Cheapest().Price
+			iPrice := its[i].Offerings.Compatible(reqs).Cheapest().Price
+			jPrice := its[j].Offerings.Compatible(reqs).Cheapest().Price
 			if iPrice == jPrice {
 				return its[i].Name < its[j].Name
 			}