Skip to content

Commit 11ec99f

Browse files
authored
Merge pull request kubernetes#130127 from carlory/fix-metrics
GetRandomReadySchedulableNode does not return MetricsGrabbingDisabledError
2 parents ea50bae + 93a88f5 commit 11ec99f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/e2e/instrumentation/metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ var _ = common.SIGDescribe("Metrics", func() {
5959
ginkgo.It("should grab all metrics from kubelet /metrics/resource endpoint", func(ctx context.Context) {
6060
ginkgo.By("Connecting to kubelet's /metrics/resource endpoint")
6161
node, err := e2enode.GetRandomReadySchedulableNode(ctx, f.ClientSet)
62+
framework.ExpectNoError(err)
63+
response, err := grabber.GrabResourceMetricsFromKubelet(ctx, node.Name)
6264
if errors.Is(err, e2emetrics.MetricsGrabbingDisabledError) {
6365
e2eskipper.Skipf("%v", err)
6466
}
6567
framework.ExpectNoError(err)
66-
response, err := grabber.GrabResourceMetricsFromKubelet(ctx, node.Name)
67-
framework.ExpectNoError(err)
6868
gomega.Expect(response).NotTo(gomega.BeEmpty())
6969
})
7070
})

0 commit comments

Comments
 (0)