Don't provision for pods with nominated node (#1051)

aws · Dec 29, 2021 · f52fbe7 · f52fbe7
1 parent 247abcd
commit f52fbe7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/controllers/selection/controller.go b/pkg/controllers/selection/controller.go
@@ -104,7 +104,12 @@ func (c *Controller) selectProvisioner(ctx context.Context, pod *v1.Pod) (errs e
 }
 
 func isProvisionable(p *v1.Pod) bool {
-	return p.Spec.NodeName == "" && pod.FailedToSchedule(p) && !pod.IsOwnedByDaemonSet(p) && !pod.IsOwnedByNode(p)
+	return !pod.IsScheduled(p) &&
+		!pod.IsPreempting(p) &&
+		pod.FailedToSchedule(p) &&
+		!pod.IsOwnedByDaemonSet(p) &&
+		!pod.IsOwnedByNode(p)
+
 }
 
 func validate(p *v1.Pod) error {

diff --git a/pkg/utils/pod/scheduling.go b/pkg/utils/pod/scheduling.go
@@ -32,6 +32,10 @@ func IsScheduled(pod *v1.Pod) bool {
 	return pod.Spec.NodeName != ""
 }
 
+func IsPreempting(pod *v1.Pod) bool {
+	return pod.Status.NominatedNodeName != ""
+}
+
 func IsTerminal(pod *v1.Pod) bool {
 	return pod.Status.Phase == v1.PodFailed || pod.Status.Phase == v1.PodSucceeded
 }