From 16a4060eb59f71b6e4672cec438e4f8d49ae426b Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 13 Sep 2018 22:38:07 -0700 Subject: [PATCH] Remove unused internal version of Pod resource --- pkg/kubectl/polymorphichelpers/BUILD | 1 - pkg/kubectl/polymorphichelpers/attachablepodforobject.go | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/kubectl/polymorphichelpers/BUILD b/pkg/kubectl/polymorphichelpers/BUILD index fd6d8722c3..e4d6934552 100644 --- a/pkg/kubectl/polymorphichelpers/BUILD +++ b/pkg/kubectl/polymorphichelpers/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/core:go_default_library", - "//pkg/apis/core/v1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubectl:go_default_library", diff --git a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go index bb6147e258..bb4e366228 100644 --- a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go +++ b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go @@ -21,23 +21,16 @@ import ( "sort" "time" - "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - api "k8s.io/kubernetes/pkg/apis/core" - apiv1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/controller" ) // attachablePodForObject returns the pod to which to attach given an object. func attachablePodForObject(restClientGetter genericclioptions.RESTClientGetter, object runtime.Object, timeout time.Duration) (*corev1.Pod, error) { switch t := object.(type) { - case *api.Pod: - externalPod := &corev1.Pod{} - err := apiv1.Convert_core_Pod_To_v1_Pod(t, externalPod, nil) - return externalPod, err case *corev1.Pod: return t, nil } @@ -55,7 +48,7 @@ func attachablePodForObject(restClientGetter genericclioptions.RESTClientGetter, if err != nil { return nil, fmt.Errorf("cannot attach to %T: %v", object, err) } - sortBy := func(pods []*v1.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } + sortBy := func(pods []*corev1.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } pod, _, err := GetFirstPod(clientset, namespace, selector.String(), timeout, sortBy) return pod, err }