mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-06 18:54:06 +00:00
Merge pull request #119335 from mimowo/use-final-diff-for-job-pod-creation
Ensure final diff is used for setting expectations for Job pod creation
This commit is contained in:
commit
84a999923f
@ -1453,17 +1453,18 @@ func (jm *Controller) manageJob(ctx context.Context, job *batch.Job, jobCtx *syn
|
|||||||
diff = int32(MaxPodCreateDeletePerSync)
|
diff = int32(MaxPodCreateDeletePerSync)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var indexesToAdd []int
|
||||||
|
if isIndexedJob(job) {
|
||||||
|
indexesToAdd = firstPendingIndexes(jobCtx, int(diff), int(*job.Spec.Completions))
|
||||||
|
diff = int32(len(indexesToAdd))
|
||||||
|
}
|
||||||
|
|
||||||
jm.expectations.ExpectCreations(logger, jobKey, int(diff))
|
jm.expectations.ExpectCreations(logger, jobKey, int(diff))
|
||||||
errCh := make(chan error, diff)
|
errCh := make(chan error, diff)
|
||||||
logger.V(4).Info("Too few pods running", "key", jobKey, "need", wantActive, "creating", diff)
|
logger.V(4).Info("Too few pods running", "key", jobKey, "need", wantActive, "creating", diff)
|
||||||
|
|
||||||
wait := sync.WaitGroup{}
|
wait := sync.WaitGroup{}
|
||||||
|
|
||||||
var indexesToAdd []int
|
|
||||||
if isIndexedJob(job) {
|
|
||||||
indexesToAdd = firstPendingIndexes(jobCtx, int(diff), int(*job.Spec.Completions))
|
|
||||||
diff = int32(len(indexesToAdd))
|
|
||||||
}
|
|
||||||
active += diff
|
active += diff
|
||||||
|
|
||||||
podTemplate := job.Spec.Template.DeepCopy()
|
podTemplate := job.Spec.Template.DeepCopy()
|
||||||
|
Loading…
Reference in New Issue
Block a user