diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index c43789a3930a..397848245518 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -240,7 +240,6 @@ package_group( "//pkg/kubectl/cmd/auth", "//pkg/kubectl/cmd/convert", "//pkg/kubectl/cmd/cp", - "//pkg/kubectl/cmd/get", "//pkg/kubectl/explain", "//staging/src/k8s.io/kubectl/pkg/cmd", "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", @@ -255,6 +254,7 @@ package_group( "//staging/src/k8s.io/kubectl/pkg/cmd/edit", "//staging/src/k8s.io/kubectl/pkg/cmd/exec", "//staging/src/k8s.io/kubectl/pkg/cmd/expose", + "//staging/src/k8s.io/kubectl/pkg/cmd/get", "//staging/src/k8s.io/kubectl/pkg/cmd/label", "//staging/src/k8s.io/kubectl/pkg/cmd/logs", "//staging/src/k8s.io/kubectl/pkg/cmd/patch", diff --git a/go.mod b/go.mod index d7bb51ce3010..554b63a0ab87 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,6 @@ require ( github.com/json-iterator/go v1.1.7 github.com/karrick/godirwalk v1.7.5 // indirect github.com/libopenstorage/openstorage v1.0.0 - github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/lithammer/dedent v1.1.0 github.com/lpabon/godbc v0.1.1 // indirect github.com/magiconair/properties v1.8.1 // indirect @@ -123,7 +122,6 @@ require ( github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 // indirect github.com/vmware/govmomi v0.20.1 - github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 golang.org/x/lint v0.0.0-20190409202823-959b441ac422 @@ -170,7 +168,6 @@ require ( k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 - vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) replace ( diff --git a/hack/.golint_failures b/hack/.golint_failures index 4ed6cb6cece0..7e3193e6f099 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -107,7 +107,6 @@ pkg/features pkg/kubeapiserver pkg/kubeapiserver/options pkg/kubectl/cmd/convert -pkg/kubectl/cmd/get pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 pkg/kubelet/checkpointmanager/testing/example_checkpoint_formats/v1 @@ -500,6 +499,7 @@ staging/src/k8s.io/kubectl/pkg/cmd/drain staging/src/k8s.io/kubectl/pkg/cmd/exec staging/src/k8s.io/kubectl/pkg/cmd/explain staging/src/k8s.io/kubectl/pkg/cmd/expose +staging/src/k8s.io/kubectl/pkg/cmd/get staging/src/k8s.io/kubectl/pkg/cmd/label staging/src/k8s.io/kubectl/pkg/cmd/logs staging/src/k8s.io/kubectl/pkg/cmd/patch diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 62a533eec92f..c0ade63fa4fa 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -19,7 +19,6 @@ pkg/controller/statefulset pkg/credentialprovider pkg/credentialprovider/aws pkg/kubeapiserver/admission -pkg/kubectl/cmd/get pkg/kubelet/apis/podresources pkg/kubelet/cm/devicemanager pkg/kubelet/pluginmanager/operationexecutor @@ -176,6 +175,7 @@ vendor/k8s.io/kubectl/pkg/cmd/certificates vendor/k8s.io/kubectl/pkg/cmd/config vendor/k8s.io/kubectl/pkg/cmd/edit vendor/k8s.io/kubectl/pkg/cmd/exec +vendor/k8s.io/kubectl/pkg/cmd/get vendor/k8s.io/kubectl/pkg/cmd/proxy vendor/k8s.io/kubectl/pkg/cmd/rollingupdate vendor/k8s.io/kubectl/pkg/cmd/scale diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 9aa20b6298d9..74bd6c16c5ee 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -12,7 +12,6 @@ go_library( "//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library", "//pkg/kubectl/cmd/cp:go_default_library", - "//pkg/kubectl/cmd/get:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", @@ -35,6 +34,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/explain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/expose:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/get:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/label:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library", @@ -86,7 +86,6 @@ filegroup( "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", "//pkg/kubectl/cmd/cp:all-srcs", - "//pkg/kubectl/cmd/get:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index a19fe0be5f64..76c5a8f8f4f1 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -49,6 +49,7 @@ import ( cmdexec "k8s.io/kubectl/pkg/cmd/exec" "k8s.io/kubectl/pkg/cmd/explain" "k8s.io/kubectl/pkg/cmd/expose" + "k8s.io/kubectl/pkg/cmd/get" "k8s.io/kubectl/pkg/cmd/label" "k8s.io/kubectl/pkg/cmd/logs" "k8s.io/kubectl/pkg/cmd/options" @@ -72,7 +73,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" "k8s.io/kubernetes/pkg/kubectl/cmd/cp" - "k8s.io/kubernetes/pkg/kubectl/cmd/get" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/cmd/kustomize" diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index c1b154b61882..edbfad080601 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -32,6 +32,7 @@ require ( github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.3 github.com/stretchr/testify v1.3.0 + github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect @@ -46,6 +47,7 @@ require ( k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 + vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) replace ( diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index 18d573c5a6b4..82a9de8cfce5 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -220,6 +220,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= +github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 h1:a4tQYYYuK9QdeO/+kEvNYyuR21S+7ve5EANok6hABhI= @@ -304,3 +306,5 @@ sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc= +vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index ff8112d60c7d..1bd588cb8fad 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -45,6 +45,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/cmd/exec:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/explain:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/expose:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/get:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/help:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/label:all-srcs", diff --git a/pkg/kubectl/cmd/get/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD similarity index 96% rename from pkg/kubectl/cmd/get/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD index af2e32ee1a8f..a919dd097798 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD @@ -26,7 +26,8 @@ go_library( "sorter.go", "table_printer.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/get", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/get", + importpath = "k8s.io/kubectl/pkg/cmd/get", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -72,11 +73,7 @@ go_test( "humanreadable_flags_test.go", "sorter_test.go", ], - data = [ - "//api/openapi-spec", - "//test/e2e/testing-manifests:all-srcs", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/pkg/kubectl/cmd/get/customcolumn.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn.go diff --git a/pkg/kubectl/cmd/get/customcolumn_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go diff --git a/pkg/kubectl/cmd/get/customcolumn_flags_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags_test.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_flags_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags_test.go diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_test.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_test.go diff --git a/pkg/kubectl/cmd/get/get.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get.go similarity index 100% rename from pkg/kubectl/cmd/get/get.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get.go diff --git a/pkg/kubectl/cmd/get/get_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/get_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get_flags.go diff --git a/pkg/kubectl/cmd/get/get_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go similarity index 99% rename from pkg/kubectl/cmd/get/get_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go index d3a9b9a2ab64..425220adb8d0 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go @@ -1079,7 +1079,7 @@ func TestGetObjectsIdentifiedByFile(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdGet("kubectl", tf, streams) cmd.SetOutput(buf) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME AGE @@ -1105,7 +1105,7 @@ func TestGetTableObjectsIdentifiedByFile(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdGet("kubectl", tf, streams) cmd.SetOutput(buf) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME READY STATUS RESTARTS AGE @@ -2495,7 +2495,7 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) { cmd.SetOutput(buf) cmd.Flags().Set("watch", "true") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME AGE diff --git a/pkg/kubectl/cmd/get/humanreadable_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/humanreadable_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags.go diff --git a/pkg/kubectl/cmd/get/humanreadable_flags_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags_test.go similarity index 100% rename from pkg/kubectl/cmd/get/humanreadable_flags_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags_test.go diff --git a/pkg/kubectl/cmd/get/skip_printer.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/skip_printer.go similarity index 100% rename from pkg/kubectl/cmd/get/skip_printer.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/skip_printer.go diff --git a/pkg/kubectl/cmd/get/sorter.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go similarity index 100% rename from pkg/kubectl/cmd/get/sorter.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go diff --git a/pkg/kubectl/cmd/get/sorter_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/sorter_test.go similarity index 100% rename from pkg/kubectl/cmd/get/sorter_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/sorter_test.go diff --git a/pkg/kubectl/cmd/get/table_printer.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/table_printer.go similarity index 100% rename from pkg/kubectl/cmd/get/table_printer.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/table_printer.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 5d39732efceb..8cbeaffb03fb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1777,6 +1777,7 @@ k8s.io/kubectl/pkg/cmd/edit k8s.io/kubectl/pkg/cmd/exec k8s.io/kubectl/pkg/cmd/explain k8s.io/kubectl/pkg/cmd/expose +k8s.io/kubectl/pkg/cmd/get k8s.io/kubectl/pkg/cmd/kustomize k8s.io/kubectl/pkg/cmd/label k8s.io/kubectl/pkg/cmd/logs