Merge pull request #83376 from liyanhui1228/fix_test

Fix sig-node test by adding back the numNodes
This commit is contained in:
Kubernetes Prow Robot 2019-10-02 18:54:08 -07:00 committed by GitHub
commit 8e39c60919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -272,6 +272,7 @@ var _ = SIGDescribe("kubelet", func() {
nodeLabels = make(map[string]string) nodeLabels = make(map[string]string)
nodeLabels["kubelet_cleanup"] = "true" nodeLabels["kubelet_cleanup"] = "true"
nodes, err := e2enode.GetBoundedReadySchedulableNodes(c, maxNodesToCheck) nodes, err := e2enode.GetBoundedReadySchedulableNodes(c, maxNodesToCheck)
numNodes = len(nodes.Items)
framework.ExpectNoError(err) framework.ExpectNoError(err)
nodeNames = sets.NewString() nodeNames = sets.NewString()
for i := 0; i < len(nodes.Items); i++ { for i := 0; i < len(nodes.Items); i++ {
@ -284,7 +285,7 @@ var _ = SIGDescribe("kubelet", func() {
} }
// Start resourceMonitor only in small clusters. // Start resourceMonitor only in small clusters.
if len(nodes.Items) <= maxNodesToCheck { if numNodes <= maxNodesToCheck {
resourceMonitor = e2ekubelet.NewResourceMonitor(f.ClientSet, e2ekubelet.TargetContainers(), containerStatsPollingInterval) resourceMonitor = e2ekubelet.NewResourceMonitor(f.ClientSet, e2ekubelet.TargetContainers(), containerStatsPollingInterval)
resourceMonitor.Start() resourceMonitor.Start()
} }