Merge pull request #1329 from athiruma/validate_capacity_blocks

OCPCLOUD-2780: Validate aws marketType webhook

Author: openshift-merge-bot[bot]

pkg/webhooks/machine_webhook.go

@@ -782,6 +782,12 @@ func validateAWS(m *machinev1beta1.Machine, config *admissionConfig) (bool, []st
 		}
 	}
 
+	if providerSpec.MarketType != "" {
+		if err := validateAWSInstanceMarketType(providerSpec); err != nil {
+			errs = append(errs, field.Invalid(field.NewPath("providerSpec", "marketType"), providerSpec.MarketType, err.Error()))
+		}
+	}
+
 	// TODO(alberto): Validate providerSpec.BlockDevices.
 	// https://github.com/openshift/cluster-api-provider-aws/pull/299#discussion_r433920532
 
@@ -2412,3 +2418,16 @@ func validateAwsCapacityReservationId(capacityReservationId string) error {
 	}
 	return nil
 }
+
+func validateAWSInstanceMarketType(providerSpec *machinev1beta1.AWSMachineProviderConfig) error {
+	if providerSpec.MarketType == machinev1beta1.MarketTypeCapacityBlock && providerSpec.SpotMarketOptions != nil {
+		return errors.New("invalid marketType: marketType set to CapacityBlock and spotMarketOptions cannot be used together")
+	}
+	if providerSpec.MarketType == machinev1beta1.MarketTypeOnDemand && providerSpec.SpotMarketOptions != nil {
+		return errors.New("invalid marketType: setting marketType to OnDemand and spotMarketOptions cannot be used together")
+	}
+	if providerSpec.MarketType == machinev1beta1.MarketTypeCapacityBlock && len(providerSpec.CapacityReservationID) == 0 {
+		return errors.New("capacityReservationID is required when CapacityBlock is provided")
+	}
+	return nil
+}

pkg/webhooks/machine_webhook_test.go

@@ -198,6 +198,66 @@ func TestMachineCreation(t *testing.T) {
 			},
 			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: providerSpec.capacityReservationId: Invalid value: \"cr-123\": invalid value for capacityReservationId: \"cr-123\", it must start with 'cr-' and be exactly 20 characters long with 17 hexadecimal characters",
 		},
+		{
+			name:         "with MarketType set to MarketTypeCapacityBlock and spotMarketOptions are specified",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					CapacityReservationID: "cr-12345678901234567",
+					MarketType:            machinev1beta1.MarketTypeCapacityBlock,
+					SpotMarketOptions:     &machinev1beta1.SpotMarketOptions{},
+				},
+			},
+			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: providerSpec.marketType: Invalid value: \"CapacityBlock\": invalid marketType: marketType set to CapacityBlock and spotMarketOptions cannot be used together",
+		},
+		{
+			name:         "with MarketType set to MarketTypeOnDemand and spotMarketOptions are specified",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					MarketType:        machinev1beta1.MarketTypeOnDemand,
+					SpotMarketOptions: &machinev1beta1.SpotMarketOptions{},
+				},
+			},
+			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: providerSpec.marketType: Invalid value: \"OnDemand\": invalid marketType: setting marketType to OnDemand and spotMarketOptions cannot be used together",
+		},
+		{
+			name:         "with MarketType set to MarketTypeCapacityBlock is specified and CapacityReservationId is not provided",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					MarketType: machinev1beta1.MarketTypeCapacityBlock,
+				},
+			},
+			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: providerSpec.marketType: Invalid value: \"CapacityBlock\": capacityReservationID is required when CapacityBlock is provided",
+		},
+		{
+			name:         "with MarketType set to MarketTypeCapacityBlock and CapacityReservationId are provided",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					CapacityReservationID: "cr-12345678901234567",
+					MarketType:            machinev1beta1.MarketTypeCapacityBlock,
+				},
+			},
+			expectedError: "",
+		},
 		{
 			name:              "with Azure and a nil provider spec value",
 			platformType:      osconfigv1.AzurePlatformType,