Skip to content

Commit 8332446

Browse files
authored
fix: Paused ScaledObject count is reported correctly after operator restart (#6322)
Signed-off-by: Jorge Turrado <[email protected]>
1 parent aae3192 commit 8332446

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Here is an overview of all new **experimental** features:
7272

7373
### Fixes
7474

75-
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
75+
- **General**: Paused ScaledObject count is reported correctly after operator restart ([#6321](https://github.com/kedacore/keda/issues/6321))
7676

7777
### Deprecations
7878

controllers/keda/scaledobject_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ func (r *ScaledObjectReconciler) Reconcile(ctx context.Context, req ctrl.Request
209209
conditions.SetFallbackCondition(metav1.ConditionFalse, "NoFallbackFound", "No fallbacks are active on this scaled object")
210210
}
211211

212+
metricscollector.RecordScaledObjectPaused(scaledObject.Namespace, scaledObject.Name, conditions.GetPausedCondition().Status == metav1.ConditionTrue)
213+
212214
if err := kedastatus.SetStatusConditions(ctx, r.Client, reqLogger, scaledObject, &conditions); err != nil {
213215
r.EventEmitter.Emit(scaledObject, req.NamespacedName.Namespace, corev1.EventTypeWarning, eventingv1alpha1.ScaledObjectFailedType, eventreason.ScaledObjectUpdateFailed, err.Error())
214216
return ctrl.Result{}, err
@@ -246,12 +248,10 @@ func (r *ScaledObjectReconciler) reconcileScaledObject(ctx context.Context, logg
246248
return msg, err
247249
}
248250
conditions.SetPausedCondition(metav1.ConditionTrue, kedav1alpha1.ScaledObjectConditionPausedReason, msg)
249-
metricscollector.RecordScaledObjectPaused(scaledObject.Namespace, scaledObject.Name, true)
250251
return msg, nil
251252
}
252253
} else if conditions.GetPausedCondition().Status == metav1.ConditionTrue {
253254
conditions.SetPausedCondition(metav1.ConditionFalse, "ScaledObjectUnpaused", "pause annotation removed for ScaledObject")
254-
metricscollector.RecordScaledObjectPaused(scaledObject.Namespace, scaledObject.Name, false)
255255
}
256256

257257
// Check scale target Name is specified

0 commit comments

Comments
 (0)