pass instance reservation info to instance launch

Author: BraeTroutman

pkg/cloud/services/ec2/instances.go

@@ -258,6 +258,8 @@ func (s *Service) CreateInstance(ctx context.Context, scope *scope.MachineScope,
 
 	input.MarketType = scope.AWSMachine.Spec.MarketType
 
+	input.CapacityReservationPreference = scope.AWSMachine.Spec.CapacityReservationPreference
+
 	s.scope.Debug("Running instance", "machine-role", scope.Role())
 	s.scope.Debug("Running instance with instance metadata options", "metadata options", input.InstanceMetadataOptions)
 	out, err := s.runInstance(scope.Role(), input)
@@ -655,7 +657,7 @@ func (s *Service) runInstance(role string, i *infrav1.Instance) (*infrav1.Instan
 	}
 	input.MetadataOptions = getInstanceMetadataOptionsRequest(i.InstanceMetadataOptions)
 	input.PrivateDnsNameOptions = getPrivateDNSNameOptionsRequest(i.PrivateDNSName)
-	input.CapacityReservationSpecification = getCapacityReservationSpecification(i.CapacityReservationID)
+	input.CapacityReservationSpecification = getCapacityReservationSpecification(i.CapacityReservationID, i.CapacityReservationPreference)
 
 	if i.Tenancy != "" {
 		input.Placement = &types.Placement{
@@ -1144,17 +1146,25 @@ func filterGroups(list []string, strToFilter string) (newList []string) {
 	return
 }
 
-func getCapacityReservationSpecification(capacityReservationID *string) *types.CapacityReservationSpecification {
-	if capacityReservationID == nil {
-		//  Not targeting any specific Capacity Reservation
+func getCapacityReservationSpecification(capacityReservationID *string, capacityReservationPreference infrav1.CapacityReservationPreference) *types.CapacityReservationSpecification {
+	if capacityReservationID == nil && capacityReservationPreference == "" {
 		return nil
 	}
-
-	return &types.CapacityReservationSpecification{
-		CapacityReservationTarget: &types.CapacityReservationTarget{
+	var spec types.CapacityReservationSpecification
+	if capacityReservationID != nil {
+		spec.CapacityReservationTarget = &types.CapacityReservationTarget{
 			CapacityReservationId: capacityReservationID,
-		},
+		}
+	}
+	switch capacityReservationPreference {
+	case infrav1.CapacityReservationPreferenceNone:
+		spec.CapacityReservationPreference = types.CapacityReservationPreferenceNone
+	case infrav1.CapacityReservationPreferenceOnly:
+		spec.CapacityReservationPreference = types.CapacityReservationPreferenceCapacityReservationsOnly
+	case infrav1.CapacityReservationPreferenceOpen:
+		spec.CapacityReservationPreference = types.CapacityReservationPreferenceOpen
 	}
+	return &spec
 }
 
 func getInstanceMarketOptionsRequest(i *infrav1.Instance) (*types.InstanceMarketOptionsRequest, error) {

pkg/cloud/services/ec2/instances_test.go

@@ -6216,9 +6216,10 @@ func TestGetCapacityReservationSpecification(t *testing.T) {
 	mockCapacityReservationID := "cr-123"
 	mockCapacityReservationIDPtr := &mockCapacityReservationID
 	testCases := []struct {
-		name                  string
-		capacityReservationID *string
-		expectedRequest       *types.CapacityReservationSpecification
+		name                          string
+		capacityReservationID         *string
+		capacityReservationPreference infrav1.CapacityReservationPreference
+		expectedRequest               *types.CapacityReservationSpecification
 	}{
 		{
 			name:                  "with no CapacityReservationID options specified",
@@ -6234,10 +6235,29 @@ func TestGetCapacityReservationSpecification(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:                          "with a valid reservation ID and a preference",
+			capacityReservationID:         mockCapacityReservationIDPtr,
+			capacityReservationPreference: infrav1.CapacityReservationPreferenceOnly,
+			expectedRequest: &types.CapacityReservationSpecification{
+				CapacityReservationTarget: &types.CapacityReservationTarget{
+					CapacityReservationId: aws.String(mockCapacityReservationID),
+				},
+				CapacityReservationPreference: types.CapacityReservationPreferenceCapacityReservationsOnly,
+			},
+		},
+		{
+			name:                          "with no reservation ID and a preference",
+			capacityReservationID:         nil,
+			capacityReservationPreference: infrav1.CapacityReservationPreferenceNone,
+			expectedRequest: &types.CapacityReservationSpecification{
+				CapacityReservationPreference: types.CapacityReservationPreferenceNone,
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			request := getCapacityReservationSpecification(tc.capacityReservationID)
+			request := getCapacityReservationSpecification(tc.capacityReservationID, tc.capacityReservationPreference)
 			if !cmp.Equal(request, tc.expectedRequest, cmpopts.IgnoreUnexported(types.CapacityReservationSpecification{}, types.CapacityReservationTarget{})) {
 				t.Errorf("Case: %s. Got: %v, expected: %v", tc.name, request, tc.expectedRequest)
 			}