diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index b41ce591770..b2384f73e6d 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -39,8 +39,8 @@ go_library( "//cmd/kubeadm/app/util/kubeconfig:go_default_library", "//cmd/kubeadm/app/util/token:go_default_library", "//pkg/bootstrap/api:go_default_library", - "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", + "//pkg/printers:go_default_library", "//pkg/util/initsystem:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/blang/semver", diff --git a/hack/.linted_packages b/hack/.linted_packages index 65ece82c7f8..ed41208ca32 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -180,6 +180,7 @@ pkg/kubelet/volumemanager/cache pkg/kubelet/volumemanager/populator pkg/kubelet/volumemanager/reconciler pkg/labels +pkg/printers pkg/proxy/config pkg/proxy/healthcheck pkg/quota diff --git a/pkg/BUILD b/pkg/BUILD index 1307dffd852..58528cb8bfa 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -92,6 +92,7 @@ filegroup( "//pkg/labels:all-srcs", "//pkg/master:all-srcs", "//pkg/metrics:all-srcs", + "//pkg/printers:all-srcs", "//pkg/probe:all-srcs", "//pkg/proxy:all-srcs", "//pkg/quota:all-srcs", diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index c530c94d945..e1e3011dcd2 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -17,9 +17,7 @@ go_library( "cluster.go", "clusterrolebinding.go", "configmap.go", - "custom_column_printer.go", "deployment.go", - "describe.go", "doc.go", "explain.go", "generate.go", @@ -31,7 +29,6 @@ go_library( "proxy_server.go", "quota.go", "resource_filter.go", - "resource_printer.go", "rolebinding.go", "rollback.go", "rolling_updater.go", @@ -44,31 +41,24 @@ go_library( "service.go", "service_basic.go", "serviceaccount.go", - "sorted_resource_name_list.go", "sorting_printer.go", "stop.go", "versioned_client.go", ], tags = ["automanaged"], deps = [ - "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset:go_default_library", "//pkg/api:go_default_library", "//pkg/api/annotations:go_default_library", - "//pkg/api/events:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/apis/certificates:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/storage:go_default_library", - "//pkg/apis/storage/util:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", @@ -81,14 +71,12 @@ go_library( "//pkg/client/unversioned:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/credentialprovider:go_default_library", - "//pkg/fieldpath:go_default_library", "//pkg/kubectl/resource:go_default_library", - "//pkg/kubelet/qos:go_default_library", + "//pkg/printers:go_default_library", + "//pkg/printers/internalversion:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/node:go_default_library", "//pkg/util/slice:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:github.com/ghodss/yaml", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", @@ -104,12 +92,10 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/intstr", - "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/dynamic", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/integer", "//vendor:k8s.io/client-go/util/jsonpath", @@ -121,15 +107,12 @@ go_test( srcs = [ "cluster_test.go", "configmap_test.go", - "custom_column_printer_test.go", "deployment_test.go", - "describe_test.go", "generate_test.go", "kubectl_test.go", "namespace_test.go", "proxy_server_test.go", "quota_test.go", - "resource_printer_test.go", "rolling_updater_test.go", "rollout_status_test.go", "run_test.go", @@ -140,46 +123,32 @@ go_test( "service_basic_test.go", "service_test.go", "serviceaccount_test.go", - "sorted_resource_name_list_test.go", "sorting_printer_test.go", "stop_test.go", ], library = ":go_default_library", tags = ["automanaged"], deps = [ - "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/apis/policy:go_default_library", - "//pkg/apis/storage:go_default_library", - "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/controller/deployment/util:go_default_library", - "//pkg/kubectl/testing:go_default_library", - "//pkg/util:go_default_library", - "//vendor:github.com/ghodss/yaml", "//vendor:github.com/spf13/cobra", - "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/yaml", - "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 95645cd6b92..b249ac2596f 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -90,6 +90,8 @@ go_library( "//pkg/kubectl/resource:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/types:go_default_library", + "//pkg/printers:go_default_library", + "//pkg/printers/internalversion:go_default_library", "//pkg/util/crlf:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/i18n:go_default_library", @@ -198,6 +200,8 @@ go_test( "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", + "//pkg/printers:go_default_library", + "//pkg/printers/internalversion:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/spf13/cobra", @@ -208,6 +212,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/json", diff --git a/pkg/kubectl/cmd/config/BUILD b/pkg/kubectl/cmd/config/BUILD index 025d8902b70..c5f250b9032 100644 --- a/pkg/kubectl/cmd/config/BUILD +++ b/pkg/kubectl/cmd/config/BUILD @@ -28,11 +28,13 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", + "//pkg/printers:go_default_library", "//pkg/util/i18n:go_default_library", "//vendor:github.com/spf13/cobra", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/util/flag", diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index fe0fee4dda5..90aaf6f715d 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -56,6 +56,7 @@ go_test( "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", + "//pkg/printers:go_default_library", "//vendor:github.com/spf13/cobra", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index d8835d8bcfc..97c30c66791 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -20,6 +20,7 @@ go_library( "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", + "//pkg/printers:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 7df57bacab3..884cd375f5c 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -38,6 +38,8 @@ go_library( "//pkg/controller:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/resource:go_default_library", + "//pkg/printers:go_default_library", + "//pkg/printers/internalversion:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", diff --git a/pkg/kubectl/metricsutil/BUILD b/pkg/kubectl/metricsutil/BUILD index 68ab2115154..378a5b623d4 100644 --- a/pkg/kubectl/metricsutil/BUILD +++ b/pkg/kubectl/metricsutil/BUILD @@ -18,7 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/kubectl:go_default_library", + "//pkg/printers:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/printers/BUILD b/pkg/printers/BUILD new file mode 100644 index 00000000000..2fa84d674a0 --- /dev/null +++ b/pkg/printers/BUILD @@ -0,0 +1,66 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", + "go_test", +) + +go_library( + name = "go_default_library", + srcs = [ + "common.go", + "customcolumn.go", + "humanreadable.go", + "interface.go", + "json.go", + "jsonpath.go", + "name.go", + "printers.go", + "tabwriter.go", + "template.go", + "versioned.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/ghodss/yaml", + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/client-go/util/jsonpath", + ], +) + +go_test( + name = "go_default_xtest", + srcs = ["customcolumn_test.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/v1:go_default_library", + "//pkg/printers:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//pkg/printers/internalversion:all-srcs", + ], + tags = ["automanaged"], +) diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD index d8c73ed6845..18e7dfa067d 100644 --- a/pkg/printers/internalversion/BUILD +++ b/pkg/printers/internalversion/BUILD @@ -62,7 +62,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/annotations:go_default_library", "//pkg/api/events:go_default_library", - "//pkg/api/v1:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", diff --git a/vendor/BUILD b/vendor/BUILD index bca564119a4..3b756adae29 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -17119,3 +17119,10 @@ go_library( "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/install", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured_test", + srcs = ["k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_test.go"], + library = ":k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", + tags = ["automanaged"], +)