updated logic; signed commit after rebase

kedacore · Oct 28, 2022 · 1dd9773 · 1dd9773
1 parent 02f3704
commit 1dd9773
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,7 +37,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
 - [v1.0.0](#v100)
 
 ### New
-
+- **General:** Introduce autoscaling is paused annotation for ScaledJobs ([#3303](https://github.com/kedacore/keda/issues/3303))
 - **General**: Expand Prometheus metric with label "ScalerName" to distinguish different triggers. The scaleName is defined per Trigger.Name ([#3588](https://github.com/kedacore/keda/issues/3588)
 - **General:** Introduce new Loki Scaler ([#3699](https://github.com/kedacore/keda/issues/3699))
 - **General**: Add ratelimitting parameters to keda manager to allow override of client defaults ([#3730](https://github.com/kedacore/keda/issues/2920))

diff --git a/apis/keda/v1alpha1/scaledjob_types.go b/apis/keda/v1alpha1/scaledjob_types.go
@@ -73,6 +73,8 @@ type ScaledJobStatus struct {
 	LastActiveTime *metav1.Time `json:"lastActiveTime,omitempty"`
 	// +optional
 	Conditions Conditions `json:"conditions,omitempty"`
+	// +optional
+	Pause string `json:"paused,omitempty"`
 }
 
 // ScaledJobList contains a list of ScaledJob

diff --git a/controllers/keda/scaledjob_controller.go b/controllers/keda/scaledjob_controller.go
@@ -324,7 +324,7 @@ func (r *ScaledJobReconciler) updateTriggerTotalsOnDelete(namespacedName string)
 }
 
 // stopScaleLoops when scaledJob.Status.IsPaused() is set
-func (r *ScaledJobReconciler) Pause(ctx context.Context, logger logr.Logger, scaledJob *kedav1alpha1.ScaledJob) error {
+func (r *ScaledJobReconciler) Paused(ctx context.Context, logger logr.Logger, scaledJob *kedav1alpha1.ScaledJob) error {
 	if scaledJob.Annotations["scaledjob.keda.sh/paused"] == "true" {
 		logger.V(1).Info("Stopping a ScaleLoop when scaledJob is paused")
 		// stopScaleLoop

diff --git a/controllers/keda/util/predicate.go b/controllers/keda/util/predicate.go
@@ -13,6 +13,14 @@ type PausedReplicasPredicate struct {
 	predicate.Funcs
 }
 
+// define annotation as a constant "Paused = "autoscaling.keda.sh/paused""
+// define a predicate that checks if the annotation is present and if it is, return true
+const Paused = "autoscaling.keda.sh/paused"
+
+type PausedPredicate struct {
+	predicate.Funcs
+}
+
 func (PausedReplicasPredicate) Update(e event.UpdateEvent) bool {
 	if e.ObjectOld == nil || e.ObjectNew == nil {
 		return false

diff --git a/pkg/scaling/executor/scale_jobs.go b/pkg/scaling/executor/scale_jobs.go
@@ -430,7 +430,7 @@ func min(x, y int64) int64 {
 }
 
 // check if scaledJob has Paused annotation, if it does, pause the scaled job
-func (e *scaleExecutor) Pause(ctx context.Context, logger logr.Logger, scaledJob *kedav1alpha1.ScaledJob) error {
+func (e *scaleExecutor) Paused(ctx context.Context, logger logr.Logger, scaledJob *kedav1alpha1.ScaledJob) error {
 	if scaledJob.Annotations["scaledjob.keda.sh/paused"] == "true" {
 		logger.Info("ScaledJob is paused, stop scale loop")
 		return e.client.Status().Update(ctx, scaledJob)