Merge pull request #94729 from dashpole/flaky_metrics

Add retry for creating metrics grabber to fix test flakes
This commit is contained in:
Kubernetes Prow Robot 2020-09-12 01:30:56 -07:00 committed by GitHub
commit e2ea2744d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,9 @@ package monitoring
import (
"context"
"fmt"
"strings"
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
@ -40,8 +42,16 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
c = f.ClientSet
ec = f.KubemarkExternalClusterClientSet
framework.ExpectNoError(err)
grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true)
framework.ExpectNoError(err)
gomega.Eventually(func() error {
grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true)
if err != nil {
return fmt.Errorf("failed to create metrics grabber: %v", err)
}
if !grabber.HasControlPlanePods() {
return fmt.Errorf("unable to get find control plane pods")
}
return nil
}, 5*time.Minute, 10*time.Second).Should(gomega.BeNil())
})
ginkgo.It("should grab all metrics from API server.", func() {