From cb88d87dab958bf1a68bf04ffa070a85289715f6 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:41:23 -0700 Subject: [PATCH] add import-alias for k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1 --- hack/.import-aliases | 3 ++- test/e2e_node/resource_metrics_test.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 20130acaa16..66b946c3251 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -41,5 +41,6 @@ "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1": "kubeletpluginregistrationv1", "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1": "kubeletpluginregistrationv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", - "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1" + "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1", + "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1" } \ No newline at end of file diff --git a/test/e2e_node/resource_metrics_test.go b/test/e2e_node/resource_metrics_test.go index ef6b1d6bd58..11f75eabe84 100644 --- a/test/e2e_node/resource_metrics_test.go +++ b/test/e2e_node/resource_metrics_test.go @@ -21,7 +21,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1" + kubeletresourcemetricsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2elog "k8s.io/kubernetes/test/e2e/framework/log" "k8s.io/kubernetes/test/e2e/framework/metrics" @@ -111,7 +111,7 @@ var _ = framework.KubeDescribe("ResourceMetricsAPI", func() { }) func getV1alpha1ResourceMetrics() (metrics.KubeletMetrics, error) { - return metrics.GrabKubeletMetricsWithoutProxy(framework.TestContext.NodeName+":10255", "/metrics/resource/"+v1alpha1.Version) + return metrics.GrabKubeletMetricsWithoutProxy(framework.TestContext.NodeName+":10255", "/metrics/resource/"+kubeletresourcemetricsv1alpha1.Version) } func nodeId(element interface{}) string {