Merge pull request #8576 from walidghallab/fix-workqueue

Fix completions set to 1 being recognized as work queue.

Author: k8s-ci-robot

cluster-autoscaler/processors/podinjection/job_controller.go

@@ -56,8 +56,8 @@ func desiredReplicasFromJob(job *batchv1.Job) int {
 	return max(desiredReplicas, 0)
 }
 
-// isWorkQueueJob returns true if the job is a work queue job (Completions is 1 or nil and Parallelism >=0)
+// isWorkQueueJob returns true if the job is a work queue job (Completions is nil and Parallelism >=0)
 // work queue jobs should have replicas equal to Parallelism regardless in case of no Succeeded
 func isWorkQueueJob(job *batchv1.Job) bool {
-	return (job.Spec.Completions == nil || *(job.Spec.Completions) == 1) && job.Spec.Parallelism != nil && *(job.Spec.Parallelism) >= 0
+	return job.Spec.Completions == nil && job.Spec.Parallelism != nil && *(job.Spec.Parallelism) >= 0
 }

cluster-autoscaler/processors/podinjection/job_controller_test.go

@@ -74,6 +74,19 @@ func TestDesiredReplicasFromJob(t *testing.T) {
 			},
 			wantReplicas: 5,
 		},
+		{
+			name: "Parallelism is large while completion is 1",
+			job: &batchv1.Job{
+				Spec: batchv1.JobSpec{
+					Completions: &one,
+					Parallelism: &ten,
+				},
+				Status: batchv1.JobStatus{
+					Succeeded: 0,
+				},
+			},
+			wantReplicas: 1,
+		},
 		{
 			name: "Work queue with succeeded pods",
 			job: &batchv1.Job{