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

Fix panic in kubelet test

pull/6/head
Wojciech Tyczynski 2016-06-01 19:55:35 +02:00
parent 9336eb516b
commit 13b57f8ffb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/kubelet.go
View File

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