github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-23 02:47:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88227 from tanjunchen/remove-todo-and-move-code

Browse Source 
remove unused and repeat code and remove TODO
This commit is contained in:
Kubernetes Prow Robot
2020-02-25 00:52:48 -08:00
committed by GitHub
parent 95504c32fe 119f4df9c5
commit 6b6336e5c0
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/framework/providers/gce/recreate_node.go
View File

@@ -34,6 +34,12 @@ import (
testutils "k8s.io/kubernetes/test/utils"
)
const (
// recreateNodeReadyAgainTimeout is how long a node is allowed to become "Ready" after it is recreated before
// the test is considered failed.
recreateNodeReadyAgainTimeout = 10 * time.Minute
)
func nodeNames(nodes []v1.Node) []string {
result := make([]string, 0, len(nodes))
for i := range nodes {
@@ -102,9 +108,9 @@ func testRecreate(c clientset.Interface, ps *testutils.PodStore, systemNamespace
framework.Failf("Test failed; failed to start the restart instance group command.")
}
err = WaitForNodeBootIdsToChange(c, nodes, framework.RecreateNodeReadyAgainTimeout)
err = WaitForNodeBootIdsToChange(c, nodes, recreateNodeReadyAgainTimeout)
if err != nil {
framework.Failf("Test failed; failed to recreate at least one node in %v.", framework.RecreateNodeReadyAgainTimeout)
framework.Failf("Test failed; failed to recreate at least one node in %v.", recreateNodeReadyAgainTimeout)
}
nodesAfter, err := e2enode.CheckReady(c, len(nodes), framework.RestartNodeReadyAgainTimeout)