feat: add new spot allocation strategies

This commit adds two new spot allocation strategies:
capacity-optimized-prioritized and price-capacity-optimized.

Author: Fedosin

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml

@@ -747,6 +747,8 @@ spec:
                         enum:
                         - lowest-price
                         - capacity-optimized
+                        - capacity-optimized-prioritized
+                        - price-capacity-optimized
                         type: string
                     type: object
                   overrides:

exp/api/v1beta2/types.go

@@ -151,6 +151,16 @@ var (
 	// SpotAllocationStrategyCapacityOptimized will make the Auto Scaling group launch
 	// instances using Spot pools that are optimally chosen based on the available Spot capacity.
 	SpotAllocationStrategyCapacityOptimized = SpotAllocationStrategy("capacity-optimized")
+
+	// SpotAllocationStrategyCapacityOptimizedPrioritized will make the Auto Scaling group launch
+	// instances using Spot pools that are optimally chosen based on the available Spot capacity
+	// while also taking into account the priority order specified by the user for Instance Types.
+	SpotAllocationStrategyCapacityOptimizedPrioritized = SpotAllocationStrategy("capacity-optimized-prioritized")
+
+	// SpotAllocationStrategyPriceCapacityOptimized will make the Auto Scaling group launch
+	// instances using Spot pools that consider both price and available Spot capacity to
+	// provide a balance between cost savings and allocation reliability.
+	SpotAllocationStrategyPriceCapacityOptimized = SpotAllocationStrategy("price-capacity-optimized")
 )
 
 // InstancesDistribution to configure distribution of On-Demand Instances and Spot Instances.
@@ -159,7 +169,7 @@ type InstancesDistribution struct {
 	// +kubebuilder:default=prioritized
 	OnDemandAllocationStrategy OnDemandAllocationStrategy `json:"onDemandAllocationStrategy,omitempty"`
 
-	// +kubebuilder:validation:Enum=lowest-price;capacity-optimized
+	// +kubebuilder:validation:Enum=lowest-price;capacity-optimized;capacity-optimized-prioritized;price-capacity-optimized
 	// +kubebuilder:default=lowest-price
 	SpotAllocationStrategy SpotAllocationStrategy `json:"spotAllocationStrategy,omitempty"`
 

pkg/cloud/services/autoscaling/autoscalinggroup.go

@@ -70,10 +70,17 @@ func (s *Service) SDKToAutoScalingGroup(v *autoscaling.Group) (*expinfrav1.AutoS
 		}
 
 		spotAllocationStrategy := aws.StringValue(v.MixedInstancesPolicy.InstancesDistribution.SpotAllocationStrategy)
-		if spotAllocationStrategy == string(expinfrav1.SpotAllocationStrategyLowestPrice) {
+		switch spotAllocationStrategy {
+		case string(expinfrav1.SpotAllocationStrategyLowestPrice):
 			i.MixedInstancesPolicy.InstancesDistribution.SpotAllocationStrategy = expinfrav1.SpotAllocationStrategyLowestPrice
-		} else {
+		case string(expinfrav1.SpotAllocationStrategyCapacityOptimized):
 			i.MixedInstancesPolicy.InstancesDistribution.SpotAllocationStrategy = expinfrav1.SpotAllocationStrategyCapacityOptimized
+		case string(expinfrav1.SpotAllocationStrategyCapacityOptimizedPrioritized):
+			i.MixedInstancesPolicy.InstancesDistribution.SpotAllocationStrategy = expinfrav1.SpotAllocationStrategyCapacityOptimizedPrioritized
+		case string(expinfrav1.SpotAllocationStrategyPriceCapacityOptimized):
+			i.MixedInstancesPolicy.InstancesDistribution.SpotAllocationStrategy = expinfrav1.SpotAllocationStrategyPriceCapacityOptimized
+		default:
+			return nil, fmt.Errorf("unsupported spot allocation strategy: %s", spotAllocationStrategy)
 		}
 	}
 

pkg/cloud/services/autoscaling/autoscalinggroup_test.go

@@ -97,6 +97,7 @@ func TestServiceGetASGByName(t *testing.T) {
 								MixedInstancesPolicy: &autoscaling.MixedInstancesPolicy{
 									InstancesDistribution: &autoscaling.InstancesDistribution{
 										OnDemandAllocationStrategy: aws.String("prioritized"),
+										SpotAllocationStrategy:     aws.String("price-capacity-optimized"),
 									},
 									LaunchTemplate: &autoscaling.LaunchTemplate{},
 								},
@@ -301,6 +302,34 @@ func TestServiceSDKToAutoScalingGroup(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "invalid input - incorrect spot allocation strategy",
+			input: &autoscaling.Group{
+				AutoScalingGroupARN:  aws.String("test-id"),
+				AutoScalingGroupName: aws.String("test-name"),
+				DesiredCapacity:      aws.Int64(1234),
+				MaxSize:              aws.Int64(1234),
+				MinSize:              aws.Int64(1234),
+				CapacityRebalance:    aws.Bool(true),
+				MixedInstancesPolicy: &autoscaling.MixedInstancesPolicy{
+					InstancesDistribution: &autoscaling.InstancesDistribution{
+						OnDemandAllocationStrategy:          aws.String("prioritized"),
+						OnDemandBaseCapacity:                aws.Int64(1234),
+						OnDemandPercentageAboveBaseCapacity: aws.Int64(1234),
+						SpotAllocationStrategy:              aws.String("INVALIDSPOTALLOCATIONSTRATEGY"),
+					},
+					LaunchTemplate: &autoscaling.LaunchTemplate{
+						Overrides: []*autoscaling.LaunchTemplateOverrides{
+							{
+								InstanceType:     aws.String("t2.medium"),
+								WeightedCapacity: aws.String("test-weighted-cap"),
+							},
+						},
+					},
+				},
+			},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -381,6 +410,7 @@ func TestServiceASGIfExists(t *testing.T) {
 								MixedInstancesPolicy: &autoscaling.MixedInstancesPolicy{
 									InstancesDistribution: &autoscaling.InstancesDistribution{
 										OnDemandAllocationStrategy: aws.String("prioritized"),
+										SpotAllocationStrategy:     aws.String("price-capacity-optimized"),
 									},
 									LaunchTemplate: &autoscaling.LaunchTemplate{},
 								},