fix scaling bug (#181)

evryfs · Feb 2, 2021 · 2067ceb · 2067ceb
1 parent 3948dbe
commit 2067ceb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/controllers/githubactionrunner_controller.go b/controllers/githubactionrunner_controller.go
@@ -175,7 +175,7 @@ func shouldScaleUp(podRunnerPairs podRunnerPairList, instance *garov1alpha1.Gith
 }
 
 func shouldScaleDown(podRunnerPairs podRunnerPairList, instance *garov1alpha1.GithubActionRunner) bool {
-	return podRunnerPairs.numRunners() > instance.Spec.MaxRunners || ((!podRunnerPairs.allBusy()) && podRunnerPairs.numRunners() > instance.Spec.MinRunners)
+	return podRunnerPairs.numRunners() > instance.Spec.MaxRunners || (podRunnerPairs.numIdle() > 1 && (podRunnerPairs.numRunners() > instance.Spec.MinRunners))
 }
 
 func (r *GithubActionRunnerReconciler) manageOutcome(ctx context.Context, instance *garov1alpha1.GithubActionRunner, issue error) (reconcile.Result, error) {

diff --git a/controllers/podrunner_types.go b/controllers/podrunner_types.go
@@ -73,6 +73,10 @@ func (r podRunnerPairList) inSync() bool {
 	return r.numPods() == r.numRunners()
 }
 
+func (r podRunnerPairList) numIdle() int {
+	return r.numRunners() - r.numBusy()
+}
+
 func (r podRunnerPairList) getIdles(sortOrder v1alpha1.SortOrder) []podRunnerPair {
 	idles := funk.Filter(r.pairs, func(pair podRunnerPair) bool {
 		return !(pair.runner.GetBusy() || util.IsBeingDeleted(&pair.pod))