Merge pull request #22743 from gmarek/register-kubelet

Make kubelet-perf 100 pod/node test work with registered master
This commit is contained in:
Brian Grant 2016-03-09 13:58:27 -08:00
commit 3f7f167790

View File

@ -21,7 +21,6 @@ import (
"strings" "strings"
"time" "time"
"k8s.io/kubernetes/pkg/api"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
@ -186,9 +185,7 @@ var _ = Describe("Kubelet [Serial] [Slow]", func() {
var rm *resourceMonitor var rm *resourceMonitor
BeforeEach(func() { BeforeEach(func() {
// It should be OK to list unschedulable Nodes here. nodes := ListSchedulableNodesOrDie(framework.Client)
nodes, err := framework.Client.Nodes().List(api.ListOptions{})
expectNoError(err)
nodeNames = sets.NewString() nodeNames = sets.NewString()
for _, node := range nodes.Items { for _, node := range nodes.Items {
nodeNames.Insert(node.Name) nodeNames.Insert(node.Name)