github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/e2e/framework/node/:remove TODO and make some functions private

Browse Source
This commit is contained in:
tanjunchen
2020-02-21 18:45:09 +08:00
parent 58596b2bf5
commit 7c3f6fa323
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/node/wait.go
View File

@@ -164,7 +164,7 @@ func CheckReady(c clientset.Interface, size int, timeout time.Duration) ([]v1.No
// Filter out not-ready nodes.
Filter(nodes, func(node v1.Node) bool {
nodeReady := IsConditionSetAsExpected(&node, v1.NodeReady, true)
networkReady := IsConditionUnset(&node, v1.NodeNetworkUnavailable) || IsConditionSetAsExpected(&node, v1.NodeNetworkUnavailable, false)
networkReady := isConditionUnset(&node, v1.NodeNetworkUnavailable) || IsConditionSetAsExpected(&node, v1.NodeNetworkUnavailable, false)
return nodeReady && networkReady
})
numReady := len(nodes.Items)
@@ -274,7 +274,7 @@ func readyForTests(node *v1.Node, nonblockingTaints string) bool {
return false
}
} else {
if !IsNodeSchedulable(node) || !IsNodeUntainted(node) {
if !IsNodeSchedulable(node) || !isNodeUntainted(node) {
return false
}
}