From 4ca8821154b7e33405739d012c3deffba73b8e46 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:41:21 -0700 Subject: [PATCH] add import-alias for k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1 --- hack/.import-aliases | 3 ++- test/e2e_node/util.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 69395ac4db3..20130acaa16 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -40,5 +40,6 @@ "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1": "kubeletdevicepluginv1beta1", "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/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", + "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1" } \ No newline at end of file diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 6592e155131..3eadd05c07b 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + kubeletpodresourcesv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" @@ -103,7 +103,7 @@ func getNodeSummary() (*kubeletstatsv1alpha1.Summary, error) { return &summary, nil } -func getNodeDevices() (*podresourcesapi.ListPodResourcesResponse, error) { +func getNodeDevices() (*kubeletpodresourcesv1alpha1.ListPodResourcesResponse, error) { endpoint, err := util.LocalEndpoint(defaultPodResourcesPath, podresources.Socket) if err != nil { return nil, fmt.Errorf("Error getting local endpoint: %v", err) @@ -115,7 +115,7 @@ func getNodeDevices() (*podresourcesapi.ListPodResourcesResponse, error) { defer conn.Close() ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - resp, err := client.List(ctx, &podresourcesapi.ListPodResourcesRequest{}) + resp, err := client.List(ctx, &kubeletpodresourcesv1alpha1.ListPodResourcesRequest{}) if err != nil { return nil, fmt.Errorf("%v.Get(_) = _, %v", client, err) }