Merge pull request #68728 from aleksandra-malinowska/autoscaling-test-fix-24

Check network condition ready when waiting for ready nodes in e2e tests

Merge pull request #68728 from aleksandra-malinowska/autoscaling-test-fix-24
690179b1 · k8s-ci-robot · GitHub · e763a3c5 · a835171f · 690179b1
Unverified Commit 690179b1 authored Sep 17, 2018 by k8s-ci-robot Committed by GitHub Sep 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

util.go test/e2e/framework/util.go +3 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -4153,7 +4153,9 @@ func CheckNodesReady(c clientset.Interface, size int, timeout time.Duration) ([]

 		// Filter out not-ready nodes.
 		FilterNodes(nodes, func(node v1.Node) bool {
-			return IsNodeConditionSetAsExpected(&node, v1.NodeReady, true)
+			nodeReady := IsNodeConditionSetAsExpected(&node, v1.NodeReady, true)
+			networkReady := IsNodeConditionUnset(&node, v1.NodeNetworkUnavailable) || IsNodeConditionSetAsExpected(&node, v1.NodeNetworkUnavailable, false)
+			return nodeReady && networkReady
 		})
 		numReady := len(nodes.Items)