github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82106 from oomichi/circular-kubelet

Browse Source 
Cleanup DumpAllNamespaceInfo() in e2e test
This commit is contained in:
Kubernetes Prow Robot 2019-09-25 23:59:06 -07:00 committed by GitHub
commit aac13fc4eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/e2e/framework/util.go
View File

@ -1702,14 +1702,15 @@ func DumpAllNamespaceInfo(c clientset.Interface, namespace string) {
// 2. there are so many of them that working with them are mostly impossible // 2. there are so many of them that working with them are mostly impossible
// So we dump them only if the cluster is relatively small. // So we dump them only if the cluster is relatively small.
maxNodesForDump := TestContext.MaxNodesToGather maxNodesForDump := TestContext.MaxNodesToGather
if nodes, err := c.CoreV1().Nodes().List(metav1.ListOptions{}); err == nil { nodes, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
if len(nodes.Items) <= maxNodesForDump { if err != nil {
dumpAllNodeInfo(c)
} else {
e2elog.Logf("skipping dumping cluster info - cluster too large")
}
} else {
e2elog.Logf("unable to fetch node list: %v", err) e2elog.Logf("unable to fetch node list: %v", err)
return
}
if len(nodes.Items) <= maxNodesForDump {
dumpAllNodeInfo(c, nodes)
} else {
e2elog.Logf("skipping dumping cluster info - cluster too large")
} }
} }
@ -1726,13 +1727,7 @@ func (o byFirstTimestamp) Less(i, j int) bool {
return o[i].FirstTimestamp.Before(&o[j].FirstTimestamp) return o[i].FirstTimestamp.Before(&o[j].FirstTimestamp)
} }
func dumpAllNodeInfo(c clientset.Interface) { func dumpAllNodeInfo(c clientset.Interface, nodes *v1.NodeList) {
// It should be OK to list unschedulable Nodes here.
nodes, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
if err != nil {
e2elog.Logf("unable to fetch node list: %v", err)
return
}
names := make([]string, len(nodes.Items)) names := make([]string, len(nodes.Items))
for ix := range nodes.Items { for ix := range nodes.Items {
names[ix] = nodes.Items[ix].Name names[ix] = nodes.Items[ix].Name