Updated the comments

Author: Thirumalesh Aaraveti

api/v1beta2/awsmachine_types.go

@@ -65,6 +65,7 @@ const (
 
 // AWSMachineSpec defines the desired state of an Amazon EC2 instance.
 // +kubebuilder:validation:XValidation:rule="!has(self.capacityReservationId) || !has(self.marketType) || self.marketType != 'Spot'",message="capacityReservationId may not be set when marketType is Spot"
+// +kubebuilder:validation:XValidation:rule="!has(self.capacityReservationId) || !has(self.spotMarketOptions)",message="cannot be set to 'Spot' when CapacityReservationID is specified"
 type AWSMachineSpec struct {
 	// ProviderID is the unique identifier as specified by the cloud provider.
 	ProviderID *string `json:"providerID,omitempty"`

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

@@ -1108,6 +1108,8 @@ spec:
             - message: capacityReservationId may not be set when marketType is Spot
               rule: '!has(self.capacityReservationId) || !has(self.marketType) ||
                 self.marketType != ''Spot'''
+            - message: cannot be set to 'Spot' when CapacityReservationID is specified
+              rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
           status:
             description: AWSMachineStatus defines the observed state of AWSMachine.
             properties:

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

@@ -1050,6 +1050,9 @@ spec:
                         is Spot
                       rule: '!has(self.capacityReservationId) || !has(self.marketType)
                         || self.marketType != ''Spot'''
+                    - message: cannot be set to 'Spot' when CapacityReservationID
+                        is specified
+                      rule: '!has(self.capacityReservationId) || !has(self.spotMarketOptions)'
                 required:
                 - spec
                 type: object

exp/api/v1beta2/awsmachinepool_webhook.go

@@ -208,11 +208,11 @@ func (r *AWSMachinePool) validateInstanceMarketType() field.ErrorList {
 		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"))
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.awsLaunchTemplate.marketType"), "cannot be set to 'Spot' when CapacityReservationID is specified"))
 	}
 
 	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"))
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.awsLaunchTemplate.spotMarketOptions"), "cannot be set to when CapacityReservationID is specified"))
 	}
 
 	return allErrs

exp/api/v1beta2/awsmachinepool_webhook_test.go

@@ -197,7 +197,7 @@ func TestAWSMachinePoolValidateCreate(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "with MarketType Spot and  CapacityReservationID value provided",
+			name: "with MarketType Spot and CapacityReservationID value provided",
 			pool: &AWSMachinePool{
 				Spec: AWSMachinePoolSpec{
 					AWSLaunchTemplate: AWSLaunchTemplate{

pkg/cloud/services/ec2/instances.go

@@ -1155,7 +1155,7 @@ func getInstanceMarketOptionsRequest(i *infrav1.Instance) (*ec2.InstanceMarketOp
 	}
 
 	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")
+		return nil, errors.New("unable to generate marketOptions for spot instance, capacityReservationID is incompatible with marketType spot and spotMarketOptions")
 	}
 
 	// Infer MarketType if not explicitly set

pkg/cloud/services/ec2/instances_test.go

@@ -5771,7 +5771,7 @@ func TestGetInstanceMarketOptionsRequest(t *testing.T) {
 			expectedError: nil,
 		},
 		{
-			name: "with an marketType Spot options specified",
+			name: "with marketType Spot specified",
 			instance: &infrav1.Instance{
 				MarketType: infrav1.MarketTypeSpot,
 			},
@@ -5784,15 +5784,15 @@ func TestGetInstanceMarketOptionsRequest(t *testing.T) {
 			},
 		},
 		{
-			name: "with an marketType Spot and CapacityRerservationID specified",
+			name: "with 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"),
+			expectedError: errors.Errorf("unable to generate marketOptions for spot instance, capacityReservationID is incompatible with marketType spot and spotMarketOptions"),
 		},
 		{
-			name: "with an spotMarketOptions and CapacityRerservationID specified",
+			name: "with spotMarketOptions and capacityRerservationID specified",
 			instance: &infrav1.Instance{
 				SpotMarketOptions:     &infrav1.SpotMarketOptions{},
 				CapacityReservationID: mockCapacityReservationID,