Stop relying on k/k SSH

wojtek-t · wojtek-t · commit 414c62dc6f4a · 2024-12-14T11:37:40.000+01:00
diff --git a/clusterloader2/pkg/measurement/common/metrics/metrics_grabber.go b/clusterloader2/pkg/measurement/common/metrics/metrics_grabber.go
@@ -59,7 +59,6 @@ type Grabber struct {
 	grabFromClusterAutoscaler         bool
 	masterName                        string
 	registeredMaster                  bool
-	waitForControllerManagerReadyOnce sync.Once
 }
 
 // deprecatedMightBeMasterNode returns true if given node is a registered master.
diff --git a/clusterloader2/pkg/provider/autopilot.go b/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 {
diff --git a/clusterloader2/pkg/provider/aws.go b/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 {
diff --git a/clusterloader2/pkg/provider/eks.go b/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 {
diff --git a/clusterloader2/pkg/provider/gce.go b/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.
diff --git a/clusterloader2/pkg/provider/gke.go b/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 {
diff --git a/clusterloader2/pkg/provider/gke_kubemark.go b/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 {
diff --git a/clusterloader2/pkg/provider/kubemark.go b/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 {
diff --git a/clusterloader2/pkg/provider/local.go b/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 {
diff --git a/clusterloader2/pkg/provider/skeleton.go b/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 {
diff --git a/clusterloader2/pkg/provider/util.go b/clusterloader2/pkg/provider/util.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"
+	sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"
 )
 
 var (
diff --git a/clusterloader2/pkg/provider/vsphere.go b/clusterloader2/pkg/provider/vsphere.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 VsphereProvider struct {
diff --git a/clusterloader2/pkg/util/ssh_core.go b/clusterloader2/pkg/util/ssh_core.go

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ type Grabber struct {`
`59`	`59`	`grabFromClusterAutoscaler bool`
`60`	`60`	`masterName string`
`61`	`61`	`registeredMaster bool`
`62`		`- waitForControllerManagerReadyOnce sync.Once`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`// deprecatedMightBeMasterNode returns true if given node is a registered master.`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`"context"`
`21`	`21`
`22`	`22`	`clientset "k8s.io/client-go/kubernetes"`
`23`		`- sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"`
`24`	`23`	`prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"`
	`24`	`+ sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`type AutopilotProvider struct {`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import (`
`21`	`21`
`22`	`22`	`clientset "k8s.io/client-go/kubernetes"`
`23`	`23`	`"k8s.io/klog/v2"`
`24`		`- sshutil "k8s.io/kubernetes/test/e2e/framework/ssh"`
`25`	`24`	`prom "k8s.io/perf-tests/clusterloader2/pkg/prometheus/clients"`
	`25`	`+ sshutil "k8s.io/perf-tests/clusterloader2/pkg/util"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`type GKEKubemarkProvider struct {`