github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Move pkg/kubectl/describe to staging

Browse Source
This commit is contained in:
Sean Sullivan 2019-07-24 18:16:18 -07:00
parent 2c2ca27bfc
commit 49f5b423cf
19 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -54,7 +54,6 @@ require (
github.com/emicklei/go-restful v2.9.5+incompatible
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/evanphx/json-patch v4.2.0+incompatible
github.com/fatih/camelcase v1.0.0
github.com/fsnotify/fsnotify v1.4.7
github.com/go-bindata/go-bindata v3.1.1+incompatible
github.com/go-openapi/loads v0.19.2

2
hack/.golint_failures
View File

@ -139,7 +139,6 @@ pkg/kubectl/cmd/testing
pkg/kubectl/cmd/top
pkg/kubectl/cmd/util
pkg/kubectl/cmd/wait
pkg/kubectl/describe/versioned
pkg/kubectl/generate
pkg/kubectl/generate/versioned
pkg/kubectl/metricsutil
@ -539,6 +538,7 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
staging/src/k8s.io/kube-aggregator/pkg/apiserver
staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
staging/src/k8s.io/kube-proxy/config/v1alpha1
staging/src/k8s.io/kubectl/pkg/describe/versioned
staging/src/k8s.io/kubectl/pkg/util/templates
staging/src/k8s.io/kubelet/config/v1beta1
staging/src/k8s.io/legacy-cloud-providers/vsphere

1
pkg/kubectl/BUILD
View File

@ -84,7 +84,6 @@ filegroup(
":package-srcs",
"//pkg/kubectl/apply:all-srcs",
"//pkg/kubectl/cmd:all-srcs",
"//pkg/kubectl/describe:all-srcs",
"//pkg/kubectl/explain:all-srcs",
"//pkg/kubectl/generate:all-srcs",
"//pkg/kubectl/metricsutil:all-srcs",

2
pkg/kubectl/cmd/auth/BUILD
View File

@ -17,7 +17,6 @@ go_library(
],
deps = [
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/describe/versioned:go_default_library",
"//pkg/registry/rbac/reconciliation:go_default_library",
"//staging/src/k8s.io/api/authorization/v1:go_default_library",
"//staging/src/k8s.io/api/rbac/v1:go_default_library",
@ -34,6 +33,7 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",

2
pkg/kubectl/cmd/auth/cani.go
View File

@ -35,11 +35,11 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
discovery "k8s.io/client-go/discovery"
authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"
describeutil "k8s.io/kubectl/pkg/describe/versioned"
"k8s.io/kubectl/pkg/util/printers"
rbacutil "k8s.io/kubectl/pkg/util/rbac"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
describeutil "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
)
// CanIOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of

8
pkg/kubectl/cmd/describe/BUILD
View File

@ -7,14 +7,14 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/describe:go_default_library",
"//pkg/kubectl/describe/versioned: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/util/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
@ -30,12 +30,12 @@ go_test(
embed = [":go_default_library"],
deps = [
"//pkg/kubectl/cmd/testing:go_default_library",
"//pkg/kubectl/describe:go_default_library",
"//pkg/kubectl/describe/versioned:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
],
)

4
pkg/kubectl/cmd/describe/describe.go
View File

@ -28,11 +28,11 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/describe"
describeversioned "k8s.io/kubectl/pkg/describe/versioned"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/describe"
describeversioned "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
)
var (

4
pkg/kubectl/cmd/describe/describe_test.go
View File

@ -26,10 +26,10 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/describe"
versioneddescribe "k8s.io/kubectl/pkg/describe/versioned"
"k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/describe"
versioneddescribe "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
)
// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.

2
pkg/kubectl/polymorphichelpers/BUILD
View File

@ -25,7 +25,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubectl/describe/versioned:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
"//staging/src/k8s.io/api/apps/v1beta2:go_default_library",
@ -51,6 +50,7 @@ go_library(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/watch:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/apps:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",

2
pkg/kubectl/polymorphichelpers/history.go
View File

@ -35,9 +35,9 @@ import (
"k8s.io/client-go/kubernetes"
clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
"k8s.io/kubectl/pkg/apps"
describe "k8s.io/kubectl/pkg/describe/versioned"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
sliceutil "k8s.io/kubectl/pkg/util/slice"
describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
)
const (

1
staging/src/k8s.io/kubectl/BUILD
View File

@ -10,6 +10,7 @@ filegroup(
srcs = [
":package-srcs",
"//staging/src/k8s.io/kubectl/pkg/apps:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/describe:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/drain:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/generated:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs",

1
staging/src/k8s.io/kubectl/go.mod
View File

@ -10,6 +10,7 @@ require (
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
github.com/fatih/camelcase v1.0.0
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
github.com/mitchellh/go-wordwrap v1.0.0
github.com/onsi/ginkgo v1.8.0

2
staging/src/k8s.io/kubectl/go.sum generated
View File

@ -37,6 +37,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

5
pkg/kubectl/describe/BUILD → staging/src/k8s.io/kubectl/pkg/describe/BUILD
View File

@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["interface.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/describe",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/describe",
importpath = "k8s.io/kubectl/pkg/describe",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
@ -22,7 +23,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/kubectl/describe/versioned:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],

0
pkg/kubectl/describe/interface.go → staging/src/k8s.io/kubectl/pkg/describe/interface.go
View File

53
pkg/kubectl/describe/versioned/BUILD → staging/src/k8s.io/kubectl/pkg/describe/versioned/BUILD
View File

@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["describe.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/describe/versioned",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/describe/versioned",
importpath = "k8s.io/kubectl/pkg/describe/versioned",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubectl/describe:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
@ -38,6 +38,7 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
@ -53,6 +54,30 @@ go_library(
],
)
go_test(
name = "go_default_test",
srcs = ["describe_test.go"],
embed = [":go_default_library"],
deps = [
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/networking/v1:go_default_library",
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
"//vendor/k8s.io/utils/pointer:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
@ -66,27 +91,3 @@ filegroup(
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
go_test(
name = "go_default_test",
srcs = ["describe_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/kubectl/describe:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/networking/v1:go_default_library",
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//vendor/k8s.io/utils/pointer:go_default_library",
],
)

2
pkg/kubectl/describe/versioned/describe.go → staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go
View File

@ -65,6 +65,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/reference"
"k8s.io/klog"
"k8s.io/kubectl/pkg/describe"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/certificate"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
@ -75,7 +76,6 @@ import (
resourcehelper "k8s.io/kubectl/pkg/util/resource"
"k8s.io/kubectl/pkg/util/slice"
storageutil "k8s.io/kubectl/pkg/util/storage"
"k8s.io/kubernetes/pkg/kubectl/describe"
)
// Each level has 2 spaces for PrefixWriter

2
pkg/kubectl/describe/versioned/describe_test.go → staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go
View File

@ -39,7 +39,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/kubernetes/pkg/kubectl/describe"
"k8s.io/kubectl/pkg/describe"
utilpointer "k8s.io/utils/pointer"
)

2
vendor/modules.txt vendored
View File

@ -1642,6 +1642,8 @@ k8s.io/kube-proxy/config/v1alpha1
k8s.io/kube-scheduler/config/v1alpha1
# k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
k8s.io/kubectl/pkg/apps
k8s.io/kubectl/pkg/describe
k8s.io/kubectl/pkg/describe/versioned
k8s.io/kubectl/pkg/drain
k8s.io/kubectl/pkg/generated
k8s.io/kubectl/pkg/rawhttp