diff --git a/test/e2e/instrumentation/monitoring/metrics_grabber.go b/test/e2e/instrumentation/monitoring/metrics_grabber.go index e1adb628106..efe230ab4ee 100644 --- a/test/e2e/instrumentation/monitoring/metrics_grabber.go +++ b/test/e2e/instrumentation/monitoring/metrics_grabber.go @@ -17,15 +17,12 @@ limitations under the License. package monitoring import ( - "context" "errors" "fmt" - "strings" "time" "github.com/onsi/ginkgo" "github.com/onsi/gomega" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" @@ -39,27 +36,15 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() { f := framework.NewDefaultFramework("metrics-grabber") var c, ec clientset.Interface var grabber *e2emetrics.Grabber - var masterRegistered bool ginkgo.BeforeEach(func() { var err error c = f.ClientSet ec = f.KubemarkExternalClusterClientSet - // Check if master Node is registered - nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{}) - framework.ExpectNoError(err) - for _, node := range nodes.Items { - if strings.HasSuffix(node.Name, "master") { - masterRegistered = true - } - } gomega.Eventually(func() error { grabber, err = e2emetrics.NewMetricsGrabber(c, ec, f.ClientConfig(), true, true, true, true, true, true) if err != nil { return fmt.Errorf("failed to create metrics grabber: %v", err) } - if masterRegistered && !grabber.HasControlPlanePods() { - return fmt.Errorf("unable to get find control plane pods") - } return nil }, 5*time.Minute, 10*time.Second).Should(gomega.BeNil()) }) @@ -88,10 +73,6 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() { ginkgo.It("should grab all metrics from a Scheduler.", func() { ginkgo.By("Proxying to Pod through the API server") - if !masterRegistered { - e2eskipper.Skipf("Master is node api.Registry. Skipping testing Scheduler metrics.") - return - } response, err := grabber.GrabFromScheduler() if errors.Is(err, e2emetrics.MetricsGrabbingDisabledError) { e2eskipper.Skipf("%v", err) @@ -102,10 +83,6 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() { ginkgo.It("should grab all metrics from a ControllerManager.", func() { ginkgo.By("Proxying to Pod through the API server") - if !masterRegistered { - e2eskipper.Skipf("Master is node api.Registry. Skipping testing ControllerManager metrics.") - return - } response, err := grabber.GrabFromControllerManager() if errors.Is(err, e2emetrics.MetricsGrabbingDisabledError) { e2eskipper.Skipf("%v", err)