From a835171f60fa77527e525a066e2b11764d1e8fff Mon Sep 17 00:00:00 2001 From: Aleksandra Malinowska Date: Mon, 17 Sep 2018 11:33:47 +0200 Subject: [PATCH] Check network condition ready when waiting for ready nodes --- test/e2e/framework/util.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 1ef4a3e683..08b2f21827 100644 --- 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)