From c814f615103f0b9187c88ee892b9fc50bc4bbe48 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Fri, 9 Nov 2018 11:33:11 -0800 Subject: [PATCH] kubectl get: remove internal resource dependency --- pkg/kubectl/cmd/get/BUILD | 2 +- pkg/kubectl/cmd/get/get.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index a14665b829..76ebf4a7a0 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -25,7 +25,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/apis/core:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", @@ -35,6 +34,7 @@ go_library( "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", "//pkg/util/interrupt:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/kubectl/cmd/get/get.go b/pkg/kubectl/cmd/get/get.go index 2739b3bc8c..a1e6d72379 100644 --- a/pkg/kubectl/cmd/get/get.go +++ b/pkg/kubectl/cmd/get/get.go @@ -26,6 +26,7 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" + corev1 "k8s.io/api/core/v1" kapierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -41,7 +42,6 @@ import ( "k8s.io/client-go/rest" watchtools "k8s.io/client-go/tools/watch" "k8s.io/kubernetes/pkg/api/legacyscheme" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" @@ -768,8 +768,8 @@ func (o *GetOptions) printGeneric(r *resource.Result) error { // we have more than one item, so coerce all items into a list. // we don't want an *unstructured.Unstructured list yet, as we // may be dealing with non-unstructured objects. Compose all items - // into an api.List, and then decode using an unstructured scheme. - list := api.List{ + // into an corev1.List, and then decode using an unstructured scheme. + list := corev1.List{ TypeMeta: metav1.TypeMeta{ Kind: "List", APIVersion: "v1", @@ -777,7 +777,7 @@ func (o *GetOptions) printGeneric(r *resource.Result) error { ListMeta: metav1.ListMeta{}, } for _, info := range infos { - list.Items = append(list.Items, info.Object) + list.Items = append(list.Items, runtime.RawExtension{Object: info.Object}) } listData, err := json.Marshal(list)