Refactored fallback logic to only patch status when the fallback is e…

controllers/keda/scaledobject_controller.go

@@ -19,6 +19,7 @@ package keda
 import (
 	"context"
 	"fmt"
+	"github.com/kedacore/keda/v2/pkg/fallback"
 	"strconv"
 	"sync"
 
@@ -203,6 +204,10 @@ func (r *ScaledObjectReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		conditions.SetReadyCondition(metav1.ConditionTrue, kedav1alpha1.ScaledObjectConditionReadySuccessReason, msg)
 	}
 
+	if scaledObject.Spec.Fallback == nil || !fallback.HasValidFallback(scaledObject) {
+		conditions.SetFallbackCondition(metav1.ConditionFalse, "NoFallbackFound", "No fallbacks are active on this scaled object")
+	}
+
 	if err := kedastatus.SetStatusConditions(ctx, r.Client, reqLogger, scaledObject, &conditions); err != nil {
 		r.EventEmitter.Emit(scaledObject, req.NamespacedName, corev1.EventTypeWarning, eventemitter.ScaledObjectFailedType, eventreason.ScaledObjectUpdateFailed, err.Error())
 		return ctrl.Result{}, err

pkg/fallback/fallback.go

@@ -69,7 +69,7 @@ func GetMetricsWithFallback(ctx context.Context, client runtimeclient.Client, me
 	switch {
 	case !isFallbackEnabled(scaledObject, metricSpec):
 		return nil, false, suppressedError
-	case !validateFallback(scaledObject):
+	case !HasValidFallback(scaledObject):
 		log.Info("Failed to validate ScaledObject Spec. Please check that parameters are positive integers", "scaledObject.Namespace", scaledObject.Namespace, "scaledObject.Name", scaledObject.Name)
 		return nil, false, suppressedError
 	case *healthStatus.NumberOfFailures > scaledObject.Spec.Fallback.FailureThreshold:
@@ -79,11 +79,7 @@ func GetMetricsWithFallback(ctx context.Context, client runtimeclient.Client, me
 	}
 }
 
-func fallbackExistsInScaledObject(scaledObject *kedav1alpha1.ScaledObject, metricSpec v2.MetricSpec) bool {
-	if !isFallbackEnabled(scaledObject, metricSpec) || !validateFallback(scaledObject) {
-		return false
-	}
-
+func fallbackExistsInScaledObject(scaledObject *kedav1alpha1.ScaledObject) bool {
 	for _, element := range scaledObject.Status.Health {
 		if element.Status == kedav1alpha1.HealthStatusFailing && *element.NumberOfFailures > scaledObject.Spec.Fallback.FailureThreshold {
 			return true
@@ -93,7 +89,7 @@ func fallbackExistsInScaledObject(scaledObject *kedav1alpha1.ScaledObject, metri
 	return false
 }
 
-func validateFallback(scaledObject *kedav1alpha1.ScaledObject) bool {
+func HasValidFallback(scaledObject *kedav1alpha1.ScaledObject) bool {
 	return scaledObject.Spec.Fallback.FailureThreshold >= 0 &&
 		scaledObject.Spec.Fallback.Replicas >= 0
 }
@@ -115,7 +111,11 @@ func doFallback(scaledObject *kedav1alpha1.ScaledObject, metricSpec v2.MetricSpe
 func updateStatus(ctx context.Context, client runtimeclient.Client, scaledObject *kedav1alpha1.ScaledObject, status *kedav1alpha1.ScaledObjectStatus, metricSpec v2.MetricSpec) {
 	patch := runtimeclient.MergeFrom(scaledObject.DeepCopy())
 
-	if fallbackExistsInScaledObject(scaledObject, metricSpec) {
+	if !isFallbackEnabled(scaledObject, metricSpec) || !HasValidFallback(scaledObject) {
+		return
+	}
+
+	if fallbackExistsInScaledObject(scaledObject) {
 		status.Conditions.SetFallbackCondition(metav1.ConditionTrue, "FallbackExists", "At least one trigger is falling back on this scaled object")
 	} else {
 		status.Conditions.SetFallbackCondition(metav1.ConditionFalse, "NoFallbackFound", "No fallbacks are active on this scaled object")