Merge pull request #3051 from wojtek-t/remove_test_framework

Remove dependency on kubernetes test/e2e in clusterloader2

Author: k8s-ci-robot

clusterloader2/pkg/measurement/common/metrics/metrics_grabber.go

@@ -20,16 +20,11 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"sync"
-	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/cluster/ports"
-	"k8s.io/kubernetes/test/e2e/framework"
-	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 
 	"k8s.io/klog/v2"
 )
@@ -50,16 +45,15 @@ type Collection struct {
 
 // Grabber provides functions which grab metrics from components
 type Grabber struct {
-	client                            clientset.Interface
-	externalClient                    clientset.Interface
-	grabFromAPIServer                 bool
-	grabFromControllerManager         bool
-	grabFromKubelets                  bool
-	grabFromScheduler                 bool
-	grabFromClusterAutoscaler         bool
-	masterName                        string
-	registeredMaster                  bool
-	waitForControllerManagerReadyOnce sync.Once
+	client                    clientset.Interface
+	externalClient            clientset.Interface
+	grabFromAPIServer         bool
+	grabFromControllerManager bool
+	grabFromKubelets          bool
+	grabFromScheduler         bool
+	grabFromClusterAutoscaler bool
+	masterName                string
+	registeredMaster          bool
 }
 
 // deprecatedMightBeMasterNode returns true if given node is a registered master.
@@ -192,27 +186,7 @@ func (g *Grabber) GrabFromControllerManager() (ControllerManagerMetrics, error)
 		return ControllerManagerMetrics{}, fmt.Errorf("master's Kubelet is not registered. Skipping ControllerManager's metrics gathering")
 	}
 
-	var err error
 	podName := fmt.Sprintf("%v-%v", "kube-controller-manager", g.masterName)
-	g.waitForControllerManagerReadyOnce.Do(func() {
-		if readyErr := e2epod.WaitTimeoutForPodReadyInNamespace(context.Background(), g.client, podName, metav1.NamespaceSystem, framework.PodStartTimeout); readyErr != nil {
-			err = fmt.Errorf("error waiting for controller manager pod to be ready: %w", readyErr)
-			return
-		}
-
-		var lastMetricsFetchErr error
-		if metricsWaitErr := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
-			_, lastMetricsFetchErr = g.getMetricsFromPod(g.client, podName, metav1.NamespaceSystem, ports.KubeControllerManagerPort, true)
-			return lastMetricsFetchErr == nil, nil
-		}); metricsWaitErr != nil {
-			err = fmt.Errorf("error waiting for controller manager pod to expose metrics: %v; %v", metricsWaitErr, lastMetricsFetchErr)
-			return
-		}
-	})
-	if err != nil {
-		return ControllerManagerMetrics{}, err
-	}
-
 	output, err := g.getMetricsFromPod(g.client, podName, metav1.NamespaceSystem, ports.KubeControllerManagerPort, true)
 	if err != nil {
 		return ControllerManagerMetrics{}, err

clusterloader2/pkg/provider/autopilot.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type AutopilotProvider struct {

clusterloader2/pkg/provider/aws.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type AWSProvider struct {

clusterloader2/pkg/provider/eks.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type EKSProvider struct {

clusterloader2/pkg/provider/gce.go

@@ -24,10 +24,9 @@ import (
 
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	"k8s.io/perf-tests/clusterloader2/pkg/framework/client"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
-	"k8s.io/perf-tests/clusterloader2/pkg/util"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type GCEProvider struct {
@@ -84,7 +83,7 @@ func (p *GCEProvider) Metadata(c clientset.Interface) (map[string]string, error)
 
 	var masterInstanceIDs []string
 	for _, node := range nodes {
-		if util.LegacyIsMasterNode(&node) || util.IsControlPlaneNode(&node) {
+		if sshutil.LegacyIsMasterNode(&node) || sshutil.IsControlPlaneNode(&node) {
 			zone, ok := node.Labels["topology.kubernetes.io/zone"]
 			if !ok {
 				// Fallback to old label to make it work for old k8s versions.

clusterloader2/pkg/provider/gke.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type GKEProvider struct {

clusterloader2/pkg/provider/gke_kubemark.go

@@ -21,8 +21,8 @@ import (
 
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type GKEKubemarkProvider struct {

clusterloader2/pkg/provider/kubemark.go

@@ -21,8 +21,8 @@ import (
 
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type KubemarkProvider struct {

clusterloader2/pkg/provider/local.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type LocalProvider struct {

clusterloader2/pkg/provider/skeleton.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientset "k8s.io/client-go/kubernetes"
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
 	prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 type SkeletonProvider struct {