fix: ScalingModifiers admission checks the metric type correctly (#6687)

* fix: ScalingModifiers admission checks the metric type correctly

Signed-off-by: Jorge Turrado <[email protected]>

* fix: ScalingModifiers admission checks the metric type correctly

Signed-off-by: Jorge Turrado <[email protected]>

---------

Signed-off-by: Jorge Turrado <[email protected]>

Author: JorTurFer

apis/keda/v1alpha1/scaledobject_types.go

@@ -136,6 +136,7 @@ type ScalingModifiers struct {
 	// +optional
 	ActivationTarget string `json:"activationTarget,omitempty"`
 	// +optional
+	// +kubebuilder:validation:Enum=AverageValue;Value
 	MetricType autoscalingv2.MetricTargetType `json:"metricType,omitempty"`
 }
 
@@ -295,7 +296,7 @@ func CheckFallbackValid(scaledObject *ScaledObject) error {
 	}
 
 	if scaledObject.IsUsingModifiers() {
-		if scaledObject.Spec.Advanced.ScalingModifiers.MetricType != autoscalingv2.AverageValueMetricType {
+		if scaledObject.Spec.Advanced.ScalingModifiers.MetricType == autoscalingv2.ValueMetricType {
 			return fmt.Errorf("when using ScalingModifiers, ScaledObject.Spec.Advanced.ScalingModifiers.MetricType must be AverageValue to have fallback enabled")
 		}
 	} else {

config/crd/bases/keda.sh_scaledobjects.yaml

@@ -214,6 +214,9 @@ spec:
                         description: |-
                           MetricTargetType specifies the type of metric being targeted, and should be either
                           "Value", "AverageValue", or "Utilization"
+                        enum:
+                        - AverageValue
+                        - Value
                         type: string
                       target:
                         type: string