Merge pull request #21003 from roberthbailey/revert-19469

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-14 06:45:32 -08:00
commit 663ae6c5db

View File

@ -100,15 +100,12 @@ var _ = Describe("MetricsGrabber", func() {
}) })
It("should grab all metrics from a Kubelet.", func() { It("should grab all metrics from a Kubelet.", func() {
// We run this test only on GCE, as for some reason it flakes in GKE #19468
if providerIs("gce") {
By("Proxying to Node through the API server") By("Proxying to Node through the API server")
nodes := ListSchedulableNodesOrDie(c) nodes := ListSchedulableNodesOrDie(c)
Expect(nodes.Items).NotTo(BeEmpty()) Expect(nodes.Items).NotTo(BeEmpty())
response, err := grabber.GrabFromKubelet(nodes.Items[0].Name) response, err := grabber.GrabFromKubelet(nodes.Items[0].Name)
expectNoError(err) expectNoError(err)
checkNecessaryMetrics(metrics.Metrics(response), metrics.NecessaryKubeletMetrics) checkNecessaryMetrics(metrics.Metrics(response), metrics.NecessaryKubeletMetrics)
}
}) })
It("should grab all metrics from a Scheduler.", func() { It("should grab all metrics from a Scheduler.", func() {