fixCapacityValueRequirements

Signed-off-by: Britania Rodriguez Reyes <[email protected]>

Author: britaniar

pkg/propertychecker/azure/checker.go

@@ -27,6 +27,11 @@ const (
 	// The value is constrained to a reasonable upper bound of 200 for most production workloads.
 	// Upper bound is enforced after adjusting for operator semantics.
 	maxVMInstanceCapacity = 200
+
+	// minVMInstanceCapacity defines the minimum allowed VM instance capacity for SKU capacity requirements.
+	// The Azure Capacity API requires capacity values greater than 0, so minimum is set to 1.
+	// Lower bound is enforced after adjusting for operator semantics.
+	minVMInstanceCapacity = 1
 )
 
 // PropertyChecker provides Azure-specific property validation for member clusters.
@@ -48,8 +53,8 @@ func NewPropertyChecker(vmSizeRecommenderClient compute.AttributeBasedVMSizeReco
 
 // CheckIfMeetSKUCapacityRequirement validates whether a member cluster can meet the specified
 // SKU capacity requirement. It extracts the required SKU and capacity from the property selector
-// requirement and checks to determine if the cluster's Azure subscription
-// and location can provision the requested VM instances.
+// requirement and checks whether the cluster's Azure subscription and location can provision
+// the requested VM instances.
 //
 // The cluster must have both Azure location and subscription ID labels configured.
 // Returns true if the SKU capacity requirement can be met, false otherwise.
@@ -116,9 +121,8 @@ func (s *PropertyChecker) CheckIfMeetSKUCapacityRequirement(
 // extractCapacityRequirements extracts the capacity value from a PropertySelectorRequirement.
 // This function is specifically designed for Azure SKU capacity properties that follow the pattern:
 // "kubernetes.azure.com/vm-sizes/{sku}/capacity"
-// Returns the capacity if the requirement is valid;
-// The capacity will be updated based on the configured operator as VMSizeRecommender API
-// checks if the current allocatableCapacity > the requested capacity.
+// Returns the capacity value adjusted for the operator semantics, as the VMSizeRecommender API
+// checks whether current allocatable capacity is greater than the requested capacity.
 func extractCapacityRequirements(req placementv1beta1.PropertySelectorRequirement) (uint32, error) {
 	if req.Operator != placementv1beta1.PropertySelectorGreaterThan && req.Operator != placementv1beta1.PropertySelectorGreaterThanOrEqualTo {
 		return 0, fmt.Errorf("unsupported operator %q for SKU capacity property, only GreaterThan (Gt) and GreaterThanOrEqualTo (Ge) are supported", req.Operator)
@@ -149,7 +153,9 @@ func validateCapacity(value string, operator placementv1beta1.PropertySelectorOp
 
 	capacity := uint32(valueUint) // capacity is >= 0 since it's parsed as uint.
 
-	if operator == placementv1beta1.PropertySelectorGreaterThanOrEqualTo && capacity > 0 {
+	// Adjust capacity based on operator semantics for VMSizeRecommender API.
+	// If operator is GreaterThanOrEqualTo, decrement capacity by 1 as the API checks for strictly greater than.
+	if operator == placementv1beta1.PropertySelectorGreaterThanOrEqualTo && capacity >= minVMInstanceCapacity {
 		capacity -= 1
 	}
 
@@ -158,9 +164,10 @@ func validateCapacity(value string, operator placementv1beta1.PropertySelectorOp
 		return 0, fmt.Errorf("capacity value %d exceeds maximum allowed value of %d", capacity, maxVMInstanceCapacity)
 	}
 
-	// A capacity of zero is only valid for GreaterThan operator.
-	if capacity == 0 && operator != placementv1beta1.PropertySelectorGreaterThan {
-		return 0, fmt.Errorf("capacity value cannot be zero for operator %q", operator)
+	// Ensure capacity meets minimum requirements (minVMInstanceCapacity) after operator adjustment.
+	// The VMSizeRecommender API requires capacity > 0.
+	if capacity < minVMInstanceCapacity {
+		return 0, fmt.Errorf("capacity value cannot be below minimum %d after adjustment", minVMInstanceCapacity)
 	}
 
 	return capacity, nil

pkg/propertychecker/azure/checker_test.go

@@ -72,11 +72,11 @@ func TestValidateCapacity(t *testing.T) {
 			errorSubstring: "invalid capacity value",
 		},
 		{
-			name:           "unsupported operator for capacity of zero",
+			name:           "invalid value of zero for capacity",
 			value:          "0",
 			operator:       placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
 			wantError:      true,
-			errorSubstring: "capacity value cannot be zero for operator",
+			errorSubstring: fmt.Sprintf("capacity value cannot be below minimum %d after adjustment", minVMInstanceCapacity),
 		},
 		{
 			name:           "capacity equal to max limit with GreaterThan operator",
@@ -86,11 +86,12 @@ func TestValidateCapacity(t *testing.T) {
 			errorSubstring: "exceeds maximum allowed value",
 		},
 		{
-			name:      "supported operator with capacity of zero",
-			value:     "0",
-			operator:  placementv1beta1.PropertySelectorGreaterThan,
-			wantValue: 0,
-			wantError: false,
+			name:           "unsupported operator with capacity of 1",
+			value:          "1",
+			operator:       placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
+			wantValue:      0,
+			wantError:      true,
+			errorSubstring: fmt.Sprintf("capacity value cannot be below minimum %d after adjustment", minVMInstanceCapacity),
 		},
 		{
 			name:      "capacity equal to max limit with supported operator",
@@ -113,6 +114,13 @@ func TestValidateCapacity(t *testing.T) {
 			wantValue: 1,
 			wantError: false,
 		},
+		{
+			name:      "capacity at minimum limit after adjustment",
+			value:     "2",
+			operator:  placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
+			wantValue: 1,
+			wantError: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -172,6 +180,17 @@ func TestExtractCapacityRequirements(t *testing.T) {
 			wantError:      true,
 			errorSubstring: "exceeds maximum allowed value of 200",
 		},
+		{
+			name: "invalid Azure SKU capacity property exceeding min limit",
+			req: placementv1beta1.PropertySelectorRequirement{
+				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, "Standard_B2ms"),
+				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
+				Values:   []string{"1"},
+			},
+			wantSKU:        "Standard_B2ms",
+			wantError:      true,
+			errorSubstring: fmt.Sprintf("capacity value cannot be below minimum %d after adjustment", minVMInstanceCapacity),
+		},
 		{
 			name: "invalid Azure SKU capacity property with decimal",
 			req: placementv1beta1.PropertySelectorRequirement{
@@ -402,7 +421,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			errorSubstring: "unsupported operator \"Eq\" for SKU capacity property, only GreaterThan (Gt) and GreaterThanOrEqualTo (Ge) are supported",
 		},
 		{
-			name:           "unsupported operator in requirement",
+			name:           "invalid value in requirement",
 			cluster:        cluster,
 			sku:            validSKU,
 			targetCapacity: 0,
@@ -413,7 +432,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			},
 			mockStatusCode: http.StatusOK,
 			wantError:      true,
-			errorSubstring: "capacity value cannot be zero for operator",
+			errorSubstring: fmt.Sprintf("capacity value cannot be below minimum %d after adjustment", minVMInstanceCapacity),
 		},
 		{
 			name:           "cases-insensitive request - available SKU",