github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26642 from wojtek-t/fix_kubelet_test_panics 

Fix panic in kubelet test
pull/6/head
Alex Robinson 2016-06-01 15:41:35 -04:00
parent 517dedd419 13b57f8ffb
commit 903821354e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/kubelet.go
View File

@ -155,7 +155,7 @@ var _ = framework.KubeDescribe("kubelet", func() {
updateNodeLabels(c, nodeNames, nodeLabels, nil)
// Start resourceMonitor only in small clusters.
if len(nodes.Items) < maxNodesToCheck {
if len(nodes.Items) <= maxNodesToCheck {
resourceMonitor = framework.NewResourceMonitor(f.Client, framework.TargetContainers(), containerStatsPollingInterval)
resourceMonitor.Start()
}
@ -199,7 +199,9 @@ var _ = framework.KubeDescribe("kubelet", func() {
// transition to the running status.
Expect(waitTillNPodsRunningOnNodes(f.Client, nodeNames, rcName, f.Namespace.Name, totalPods,
time.Second*30)).NotTo(HaveOccurred())
if resourceMonitor != nil {
resourceMonitor.LogLatest()
}
By("Deleting the RC")
framework.DeleteRC(f.Client, f.Namespace.Name, rcName)
@ -215,7 +217,9 @@ var _ = framework.KubeDescribe("kubelet", func() {
itArg.timeout)).NotTo(HaveOccurred())
framework.Logf("Deleting %d pods on %d nodes completed in %v after the RC was deleted", totalPods, len(nodeNames),
time.Since(start))
if resourceMonitor != nil {
resourceMonitor.LogCPUSummary()
}
})
}
})