mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #94729 from dashpole/flaky_metrics
Add retry for creating metrics grabber to fix test flakes
This commit is contained in:
commit
e2ea2744d8
@ -18,7 +18,9 @@ package monitoring
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
@ -40,8 +42,16 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
|
|||||||
c = f.ClientSet
|
c = f.ClientSet
|
||||||
ec = f.KubemarkExternalClusterClientSet
|
ec = f.KubemarkExternalClusterClientSet
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
|
gomega.Eventually(func() error {
|
||||||
grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true)
|
grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true)
|
||||||
framework.ExpectNoError(err)
|
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() {
|
ginkgo.It("should grab all metrics from API server.", func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user