Merge pull request kubernetes#89639 from gavinfish/kubelet-metrics

e2e/framework: remove direct imports to /pkg/kubelet/...

Author: k8s-ci-robot

test/e2e/framework/metrics/BUILD

@@ -22,8 +22,6 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/test/e2e/framework/metrics",
     deps = [
-        "//pkg/kubelet/dockershim/metrics:go_default_library",
-        "//pkg/kubelet/metrics:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",

test/e2e/framework/metrics/kubelet_metrics.go

@@ -29,13 +29,26 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/component-base/metrics/testutil"
-	dockermetrics "k8s.io/kubernetes/pkg/kubelet/dockershim/metrics"
-	kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 )
 
 const (
 	proxyTimeout = 2 * time.Minute
+	// dockerOperationsLatencyKey is the key for the operation latency metrics.
+	// Taken from k8s.io/kubernetes/pkg/kubelet/dockershim/metrics
+	dockerOperationsLatencyKey = "docker_operations_duration_seconds"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	kubeletSubsystem = "kubelet"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	podWorkerDurationKey = "pod_worker_duration_seconds"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	podStartDurationKey = "pod_start_duration_seconds"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	cgroupManagerOperationsKey = "cgroup_manager_duration_seconds"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	podWorkerStartDurationKey = "pod_worker_start_duration_seconds"
+	// Taken from k8s.io/kubernetes/pkg/kubelet/metrics
+	plegRelistDurationKey = "pleg_relist_duration_seconds"
 )
 
 // KubeletMetrics is metrics for kubelet
@@ -143,7 +156,7 @@ func GetKubeletMetrics(c clientset.Interface, nodeName string) (KubeletMetrics,
 
 	kubeletMetrics := make(KubeletMetrics)
 	for name, samples := range ms {
-		const prefix = kubeletmetrics.KubeletSubsystem + "_"
+		const prefix = kubeletSubsystem + "_"
 		if !strings.HasPrefix(name, prefix) {
 			// Not a kubelet metric.
 			continue
@@ -159,13 +172,13 @@ func GetKubeletMetrics(c clientset.Interface, nodeName string) (KubeletMetrics,
 // Note that the KubeletMetrics passed in should not contain subsystem prefix.
 func GetDefaultKubeletLatencyMetrics(ms KubeletMetrics) KubeletLatencyMetrics {
 	latencyMetricNames := sets.NewString(
-		kubeletmetrics.PodWorkerDurationKey,
-		kubeletmetrics.PodWorkerStartDurationKey,
-		kubeletmetrics.PodStartDurationKey,
-		kubeletmetrics.CgroupManagerOperationsKey,
-		dockermetrics.DockerOperationsLatencyKey,
-		kubeletmetrics.PodWorkerStartDurationKey,
-		kubeletmetrics.PLEGRelistDurationKey,
+		podWorkerDurationKey,
+		podWorkerStartDurationKey,
+		podStartDurationKey,
+		cgroupManagerOperationsKey,
+		dockerOperationsLatencyKey,
+		podWorkerStartDurationKey,
+		plegRelistDurationKey,
 	)
 	return GetKubeletLatencyMetrics(ms, latencyMetricNames)
 }