Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.25
Browse files Browse the repository at this point in the history
  • Loading branch information
k8s-release-robot committed Aug 11, 2022
2 parents 9153e96 + 7b1b801 commit 7ba98ac
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkg/scheduler/framework/preemption/preemption.go
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ func (ev *Evaluator) DryRunPreemption(ctx context.Context, pod *v1.Pod, potentia
nonViolatingCandidates := newCandidateList(numCandidates)
violatingCandidates := newCandidateList(numCandidates)
parallelCtx, cancel := context.WithCancel(ctx)
defer cancel()
nodeStatuses := make(framework.NodeToStatusMap)
var statusesLock sync.Mutex
var errs []error
Expand Down

0 comments on commit 7ba98ac

Please sign in to comment.