update exp apis with preference fields

Author: BraeTroutman

api/v1beta2/awsmachine_webhook.go

@@ -381,8 +381,8 @@ func (r *AWSMachine) validateNetworkElasticIPPool() field.ErrorList {
 
 func (r *AWSMachine) validateCapacityReservation() field.ErrorList {
 	var allErrs field.ErrorList
-	if r.Spec.CapacityReservationID != nil && r.Spec.CapacityReservationPreference != CapacityReservationPreferenceOnly || r.Spec.CapacityReservationPreference == "" {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "capacityReservationPreference"), "capacityReservationPreference may only be set to capacity-reservations-only when a target reservation is specified"))
+	if r.Spec.CapacityReservationID != nil && r.Spec.CapacityReservationPreference != CapacityReservationPreferenceOnly && r.Spec.CapacityReservationPreference != "" {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "capacityReservationPreference"), "when a reservation ID is specified, capacityReservationPreference may only be `capacity-reservations-only` or empty"))
 	}
 	return allErrs
 }

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

@@ -644,6 +644,17 @@ spec:
                     description: CapacityReservationID specifies the target Capacity
                       Reservation into which the instance should be launched.
                     type: string
+                  capacityReservationPreference:
+                    description: |-
+                      CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
+                      "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+                      "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
+                      "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
+                    enum:
+                    - None
+                    - CapacityReservationsOnly
+                    - Open
+                    type: string
                   iamInstanceProfile:
                     description: |-
                       The name or the Amazon Resource Name (ARN) of the instance profile associated

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

@@ -653,6 +653,17 @@ spec:
                     description: CapacityReservationID specifies the target Capacity
                       Reservation into which the instance should be launched.
                     type: string
+                  capacityReservationPreference:
+                    description: |-
+                      CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
+                      "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+                      "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
+                      "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
+                    enum:
+                    - None
+                    - CapacityReservationsOnly
+                    - Open
+                    type: string
                   iamInstanceProfile:
                     description: |-
                       The name or the Amazon Resource Name (ARN) of the instance profile associated

exp/api/v1beta1/conversion.go

@@ -72,6 +72,10 @@ func (src *AWSMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Spec.AWSLaunchTemplate.MarketType = restored.Spec.AWSLaunchTemplate.MarketType
 	}
 
+	if preference := restored.Spec.AWSLaunchTemplate.CapacityReservationPreference; preference != "" {
+		dst.Spec.AWSLaunchTemplate.CapacityReservationPreference = preference
+	}
+
 	dst.Spec.DefaultInstanceWarmup = restored.Spec.DefaultInstanceWarmup
 	dst.Spec.AWSLaunchTemplate.NonRootVolumes = restored.Spec.AWSLaunchTemplate.NonRootVolumes
 	return nil
@@ -130,6 +134,10 @@ func (src *AWSManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		if restored.Spec.AWSLaunchTemplate.MarketType != "" {
 			dst.Spec.AWSLaunchTemplate.MarketType = restored.Spec.AWSLaunchTemplate.MarketType
 		}
+
+		if preference := restored.Spec.AWSLaunchTemplate.CapacityReservationPreference; preference != "" {
+			dst.Spec.AWSLaunchTemplate.CapacityReservationPreference = preference
+		}
 	}
 	if restored.Spec.AvailabilityZoneSubnetType != nil {
 		dst.Spec.AvailabilityZoneSubnetType = restored.Spec.AvailabilityZoneSubnetType

exp/api/v1beta1/zz_generated.conversion.go

@@ -211,6 +211,7 @@ func (*AWSMachinePoolWebhook) ValidateCreate(_ context.Context, obj runtime.Obje
 	allErrs = append(allErrs, r.validateSpotInstances()...)
 	allErrs = append(allErrs, r.validateRefreshPreferences()...)
 	allErrs = append(allErrs, r.validateInstanceMarketType()...)
+	allErrs = append(allErrs, r.validateCapacityReservation()...)
 	allErrs = append(allErrs, r.validateLifecycleHooks()...)
 	allErrs = append(allErrs, r.validateIgnition()...)
 
@@ -225,6 +226,16 @@ func (*AWSMachinePoolWebhook) ValidateCreate(_ context.Context, obj runtime.Obje
 	)
 }
 
+func (r *AWSMachinePool) validateCapacityReservation() field.ErrorList {
+	var allErrs field.ErrorList
+	if r.Spec.AWSLaunchTemplate.CapacityReservationID != nil &&
+		r.Spec.AWSLaunchTemplate.CapacityReservationPreference != infrav1.CapacityReservationPreferenceOnly &&
+		r.Spec.AWSLaunchTemplate.CapacityReservationPreference != "" {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "capacityReservationPreference"), "when a reservation ID is specified, capacityReservationPreference may only be `capacity-reservations-only` or empty"))
+	}
+	return allErrs
+}
+
 func (r *AWSMachinePool) validateInstanceMarketType() field.ErrorList {
 	var allErrs field.ErrorList
 	if r.Spec.AWSLaunchTemplate.MarketType == infrav1.MarketTypeCapacityBlock && r.Spec.AWSLaunchTemplate.SpotMarketOptions != nil {

exp/api/v1beta2/awsmachinepool_webhook.go

@@ -303,7 +303,18 @@ func TestAWSMachinePoolValidateCreate(t *testing.T) {
 			},
 			wantErrToContain: ptr.To("cannot be set to when CapacityReservationID is specified"),
 		},
-
+		{
+			name: "with CapacityReservationPreference of `none` and CapacityReservationID is specified",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						CapacityReservationID:         aws.String("cr-123"),
+						CapacityReservationPreference: infrav1.CapacityReservationPreferenceNone,
+					},
+				},
+			},
+			wantErrToContain: ptr.To("when a reservation ID is specified, capacityReservationPreference may only be `capacity-reservations-only` or empty"),
+		},
 		{
 			name: "invalid, MarketType set to MarketTypeCapacityBlock and spotMarketOptions are specified",
 			pool: &AWSMachinePool{

exp/api/v1beta2/awsmachinepool_webhook_test.go

@@ -146,6 +146,13 @@ type AWSLaunchTemplate struct {
 	// If marketType is not specified and spotMarketOptions is provided, the marketType defaults to "Spot".
 	// +optional
 	MarketType infrav1.MarketType `json:"marketType,omitempty"`
+
+	// CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
+	// "Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
+	// "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
+	// "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
+	// +optional
+	CapacityReservationPreference infrav1.CapacityReservationPreference `json:"capacityReservationPreference,omitempty"`
 }
 
 // Overrides are used to override the instance type specified by the launch template with multiple