e2e: Fix GetReadySchedulableNodesOrDie for taints

This changes framework.GetReadySchedulableNodesOrDie and framework.GetMasterAndWorkerNodesOrDie so that nodes that can't take a generic fake pod due to a taint/toleration mismatch aren't returned. This is a rehash of #35210, but pulls in the scheduler code.
2016-10-31 15:50:11 -07:00
parent e6b2517feb
commit 155a601425
3 changed files with 40 additions and 3 deletions
--- a/test/e2e/framework/networking_utils.go
+++ b/test/e2e/framework/networking_utils.go
@@ -316,7 +316,9 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node s
 					ReadinessProbe: probe,
 				},
 			},
-			NodeName: node,
+			NodeSelector: map[string]string{
+				"kubernetes.io/hostname": node,
+			},
 		},
 	}
 	return pod