Skip to content

Commit 918d289

Browse files
authored
fix: enhance fallback condition checks for ScalingModifiers with default metricType (#6562)
Signed-off-by: Zbynek Roubalik <[email protected]>
1 parent 4cd84f3 commit 918d289

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/fallback/fallback.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ func isFallbackEnabled(scaledObject *kedav1alpha1.ScaledObject, metricSpec v2.Me
4040
return false
4141
}
4242

43-
// If we are using ScalingModifiers, we only care whether its metric type is AverageValue.
43+
// If we are using ScalingModifiers, we only care whether its metric type is AverageValue (or not not set -> default, which is AverageValue).
4444
// If not, test the type of metricSpec passed.
45-
if scaledObject.IsUsingModifiers() && scaledObject.Spec.Advanced.ScalingModifiers.MetricType != v2.AverageValueMetricType {
46-
log.V(0).Info("Fallback can only be enabled for scalingModifiers with metric of type AverageValue", "scaledObject.Namespace", scaledObject.Namespace, "scaledObject.Name", scaledObject.Name)
45+
if scaledObject.IsUsingModifiers() && (scaledObject.Spec.Advanced.ScalingModifiers.MetricType != v2.AverageValueMetricType && scaledObject.Spec.Advanced.ScalingModifiers.MetricType != "") {
46+
log.V(0).Info("Fallback can only be enabled for scalingModifiers with metric of type AverageValue", "scaledObject.Namespace", scaledObject.Namespace, "scaledObject.Name", scaledObject.Name, "scalingModifiers.MetricType", scaledObject.Spec.Advanced.ScalingModifiers.MetricType)
4747
return false
4848
} else if !scaledObject.IsUsingModifiers() && metricSpec.External.Target.Type != v2.AverageValueMetricType {
49-
log.V(0).Info("Fallback can only be enabled for triggers with metric of type AverageValue", "scaledObject.Namespace", scaledObject.Namespace, "scaledObject.Name", scaledObject.Name)
49+
log.V(0).Info("Fallback can only be enabled for triggers with metric of type AverageValue", "scaledObject.Namespace", scaledObject.Namespace, "scaledObject.Name", scaledObject.Name, "metricSpec.External.Target.Type", metricSpec.External.Target.Type)
5050
return false
5151
}
5252

0 commit comments

Comments
 (0)