Add spotMarketRequest on marketType spot

Author: Thirumalesh Aaraveti

exp/api/v1beta2/awsmachinepool_webhook.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta2
 
 import (
+	"fmt"
 	"time"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -201,6 +202,18 @@ func (r *AWSMachinePool) validateInstanceMarketType() field.ErrorList {
 	if r.Spec.AWSLaunchTemplate.MarketType == v1beta2.MarketTypeCapacityBlock && r.Spec.AWSLaunchTemplate.CapacityReservationID == nil {
 		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.awsLaunchTemplate.capacityReservationID"), "is required when CapacityBlock is provided"))
 	}
+	switch r.Spec.AWSLaunchTemplate.MarketType {
+	case "", v1beta2.MarketTypeOnDemand, v1beta2.MarketTypeSpot, v1beta2.MarketTypeCapacityBlock:
+	default:
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec.awsLaunchTemplate.MarketType"), r.Spec.AWSLaunchTemplate.MarketType, fmt.Sprintf("Valid values are: %s, %s, %s and omitted", v1beta2.MarketTypeOnDemand, v1beta2.MarketTypeSpot, v1beta2.MarketTypeCapacityBlock)))
+	}
+	if r.Spec.AWSLaunchTemplate.MarketType == v1beta2.MarketTypeSpot && r.Spec.AWSLaunchTemplate.CapacityReservationID != nil {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.awsLaunchTemplate.marketType"), "setting marketType to Spot and CapacityReservationID cannot be used together"))
+	}
+
+	if r.Spec.AWSLaunchTemplate.CapacityReservationID != nil && r.Spec.AWSLaunchTemplate.SpotMarketOptions != nil {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.awsLaunchTemplate.spotMarketOptions"), "setting spotMarketOptions and CapacityReservationID cannot be used together"))
+	}
 
 	return allErrs
 }

exp/api/v1beta2/awsmachinepool_webhook_test.go

@@ -174,6 +174,53 @@ func TestAWSMachinePoolValidateCreate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "with invalid MarketType provided",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						MarketType: "invalid",
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "with MarketType empty value provided",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						MarketType: "",
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "with MarketType Spot and  CapacityReservationID value provided",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						MarketType:            infrav1.MarketTypeSpot,
+						CapacityReservationID: aws.String("cr-123"),
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "with CapacityReservationID and SpotMarketOptions value provided",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						SpotMarketOptions:     &infrav1.SpotMarketOptions{},
+						CapacityReservationID: aws.String("cr-123"),
+					},
+				},
+			},
+			wantErr: true,
+		},
+
 		{
 			name: "invalid, MarketType set to MarketTypeCapacityBlock and spotMarketOptions are specified",
 			pool: &AWSMachinePool{

pkg/cloud/services/ec2/instances.go

@@ -1154,6 +1154,10 @@ func getInstanceMarketOptionsRequest(i *infrav1.Instance) (*ec2.InstanceMarketOp
 		return nil, errors.New("can't create spot capacity-blocks, remove spot market request")
 	}
 
+	if (i.MarketType == infrav1.MarketTypeSpot || i.SpotMarketOptions != nil) && i.CapacityReservationID != nil {
+		return nil, errors.New("can't create spot capacity-blocks, remove capacityReservationID or remove spot requests")
+	}
+
 	// Infer MarketType if not explicitly set
 	if i.SpotMarketOptions != nil && i.MarketType == "" {
 		i.MarketType = infrav1.MarketTypeSpot
@@ -1163,6 +1167,10 @@ func getInstanceMarketOptionsRequest(i *infrav1.Instance) (*ec2.InstanceMarketOp
 		i.MarketType = infrav1.MarketTypeOnDemand
 	}
 
+	if i.MarketType == infrav1.MarketTypeSpot && i.SpotMarketOptions == nil {
+		i.SpotMarketOptions = &infrav1.SpotMarketOptions{}
+	}
+
 	switch i.MarketType {
 	case infrav1.MarketTypeCapacityBlock:
 		if i.CapacityReservationID == nil {

pkg/cloud/services/ec2/instances_test.go

@@ -5770,6 +5770,35 @@ func TestGetInstanceMarketOptionsRequest(t *testing.T) {
 			},
 			expectedError: nil,
 		},
+		{
+			name: "with an marketType Spot options specified",
+			instance: &infrav1.Instance{
+				MarketType: infrav1.MarketTypeSpot,
+			},
+			expectedRequest: &ec2.InstanceMarketOptionsRequest{
+				MarketType: aws.String(ec2.MarketTypeSpot),
+				SpotOptions: &ec2.SpotMarketOptions{
+					InstanceInterruptionBehavior: aws.String(ec2.InstanceInterruptionBehaviorTerminate),
+					SpotInstanceType:             aws.String(ec2.SpotInstanceTypeOneTime),
+				},
+			},
+		},
+		{
+			name: "with an marketType Spot and CapacityRerservationID specified",
+			instance: &infrav1.Instance{
+				MarketType:            infrav1.MarketTypeSpot,
+				CapacityReservationID: mockCapacityReservationID,
+			},
+			expectedError: errors.Errorf("can't create spot capacity-blocks, remove capacityReservationID or remove spot requests"),
+		},
+		{
+			name: "with an spotMarketOptions and CapacityRerservationID specified",
+			instance: &infrav1.Instance{
+				SpotMarketOptions:     &infrav1.SpotMarketOptions{},
+				CapacityReservationID: mockCapacityReservationID,
+			},
+			expectedError: errors.Errorf("can't create spot capacity-blocks, remove capacityReservationID or remove spot requests"),
+		},
 		{
 			name: "with an empty MaxPrice specified",
 			instance: &infrav1.Instance{