Skip to content

Commit 81f021b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#80876 from seans3/move-kubectl-cmd
Move /pkg/kubectl/cmd/{command} to staging
2 parents 666d58b + 4e64aaf commit 81f021b

File tree

477 files changed

+1435
-562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

477 files changed

+1435
-562
lines changed

‎build/visible_to/BUILD‎

Lines changed: 150 additions & 133 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ require (
4444
github.com/cpuguy83/go-md2man v1.0.10
4545
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
4646
github.com/davecgh/go-spew v1.1.1
47-
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
4847
github.com/docker/distribution v2.7.1+incompatible
4948
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
5049
github.com/docker/go-connections v0.3.0
@@ -66,9 +65,6 @@ require (
6665
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
6766
github.com/golang/mock v1.2.0
6867
github.com/golang/protobuf v1.2.0
69-
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
70-
github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
71-
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
7268
github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a
7369
github.com/google/certificate-transparency-go v1.0.21 // indirect
7470
github.com/google/go-cmp v0.3.0
@@ -82,7 +78,6 @@ require (
8278
github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect
8379
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
8480
github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 // indirect
85-
github.com/jonboulle/clockwork v0.1.0
8681
github.com/json-iterator/go v1.1.6
8782
github.com/karrick/godirwalk v1.7.5 // indirect
8883
github.com/libopenstorage/openstorage v1.0.0
@@ -176,7 +171,6 @@ require (
176171
k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
177172
k8s.io/sample-apiserver v0.0.0
178173
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
179-
sigs.k8s.io/kustomize v2.0.3+incompatible
180174
sigs.k8s.io/yaml v1.1.0
181175
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
182176
)

‎hack/.golint_failures‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,37 +107,8 @@ pkg/credentialprovider/gcp
107107
pkg/features
108108
pkg/kubeapiserver
109109
pkg/kubeapiserver/options
110-
pkg/kubectl/cmd/annotate
111-
pkg/kubectl/cmd/apply
112-
pkg/kubectl/cmd/attach
113-
pkg/kubectl/cmd/autoscale
114-
pkg/kubectl/cmd/certificates
115-
pkg/kubectl/cmd/clusterinfo
116110
pkg/kubectl/cmd/convert
117-
pkg/kubectl/cmd/create
118-
pkg/kubectl/cmd/delete
119-
pkg/kubectl/cmd/describe
120-
pkg/kubectl/cmd/diff
121-
pkg/kubectl/cmd/drain
122-
pkg/kubectl/cmd/exec
123-
pkg/kubectl/cmd/explain
124-
pkg/kubectl/cmd/expose
125111
pkg/kubectl/cmd/get
126-
pkg/kubectl/cmd/label
127-
pkg/kubectl/cmd/logs
128-
pkg/kubectl/cmd/patch
129-
pkg/kubectl/cmd/plugin
130-
pkg/kubectl/cmd/portforward
131-
pkg/kubectl/cmd/replace
132-
pkg/kubectl/cmd/rollingupdate
133-
pkg/kubectl/cmd/rollout
134-
pkg/kubectl/cmd/run
135-
pkg/kubectl/cmd/scale
136-
pkg/kubectl/cmd/set
137-
pkg/kubectl/cmd/taint
138-
pkg/kubectl/cmd/testing
139-
pkg/kubectl/cmd/top
140-
pkg/kubectl/cmd/wait
141112
pkg/kubelet
142113
pkg/kubelet/apis/config
143114
pkg/kubelet/apis/config/v1beta1
@@ -531,7 +502,37 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
531502
staging/src/k8s.io/kube-aggregator/pkg/apiserver
532503
staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
533504
staging/src/k8s.io/kube-proxy/config/v1alpha1
505+
staging/src/k8s.io/kubectl/pkg/cmd
506+
staging/src/k8s.io/kubectl/pkg/cmd/annotate
507+
staging/src/k8s.io/kubectl/pkg/cmd/apply
508+
staging/src/k8s.io/kubectl/pkg/cmd/attach
509+
staging/src/k8s.io/kubectl/pkg/cmd/autoscale
510+
staging/src/k8s.io/kubectl/pkg/cmd/certificates
511+
staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo
512+
staging/src/k8s.io/kubectl/pkg/cmd/create
513+
staging/src/k8s.io/kubectl/pkg/cmd/delete
514+
staging/src/k8s.io/kubectl/pkg/cmd/describe
515+
staging/src/k8s.io/kubectl/pkg/cmd/diff
516+
staging/src/k8s.io/kubectl/pkg/cmd/drain
517+
staging/src/k8s.io/kubectl/pkg/cmd/exec
518+
staging/src/k8s.io/kubectl/pkg/cmd/explain
519+
staging/src/k8s.io/kubectl/pkg/cmd/expose
520+
staging/src/k8s.io/kubectl/pkg/cmd/label
521+
staging/src/k8s.io/kubectl/pkg/cmd/logs
522+
staging/src/k8s.io/kubectl/pkg/cmd/patch
523+
staging/src/k8s.io/kubectl/pkg/cmd/plugin
524+
staging/src/k8s.io/kubectl/pkg/cmd/portforward
525+
staging/src/k8s.io/kubectl/pkg/cmd/replace
526+
staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate
527+
staging/src/k8s.io/kubectl/pkg/cmd/rollout
528+
staging/src/k8s.io/kubectl/pkg/cmd/run
529+
staging/src/k8s.io/kubectl/pkg/cmd/scale
530+
staging/src/k8s.io/kubectl/pkg/cmd/set
531+
staging/src/k8s.io/kubectl/pkg/cmd/taint
532+
staging/src/k8s.io/kubectl/pkg/cmd/testing
533+
staging/src/k8s.io/kubectl/pkg/cmd/top
534534
staging/src/k8s.io/kubectl/pkg/cmd/util
535+
staging/src/k8s.io/kubectl/pkg/cmd/wait
535536
staging/src/k8s.io/kubectl/pkg/describe/versioned
536537
staging/src/k8s.io/kubectl/pkg/generate
537538
staging/src/k8s.io/kubectl/pkg/generate/versioned

‎pkg/kubectl/cmd/BUILD‎

Lines changed: 45 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,66 @@
1-
load(
2-
"@io_bazel_rules_go//go:def.bzl",
3-
"go_library",
4-
"go_test",
5-
)
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
62

73
go_library(
84
name = "go_default_library",
9-
srcs = [
10-
"alpha.go",
11-
"cmd.go",
12-
"profiling.go",
13-
],
5+
srcs = ["cmd.go"],
146
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd",
15-
visibility = [
16-
"//build/visible_to:pkg_kubectl_cmd_CONSUMERS",
17-
],
7+
visibility = ["//visibility:public"],
188
deps = [
19-
"//pkg/kubectl/cmd/annotate:go_default_library",
20-
"//pkg/kubectl/cmd/apiresources:go_default_library",
21-
"//pkg/kubectl/cmd/apply:go_default_library",
22-
"//pkg/kubectl/cmd/attach:go_default_library",
239
"//pkg/kubectl/cmd/auth:go_default_library",
24-
"//pkg/kubectl/cmd/autoscale:go_default_library",
25-
"//pkg/kubectl/cmd/certificates:go_default_library",
26-
"//pkg/kubectl/cmd/clusterinfo:go_default_library",
27-
"//pkg/kubectl/cmd/completion:go_default_library",
28-
"//pkg/kubectl/cmd/config:go_default_library",
2910
"//pkg/kubectl/cmd/convert:go_default_library",
30-
"//pkg/kubectl/cmd/cp:go_default_library",
31-
"//pkg/kubectl/cmd/create:go_default_library",
32-
"//pkg/kubectl/cmd/delete:go_default_library",
33-
"//pkg/kubectl/cmd/describe:go_default_library",
34-
"//pkg/kubectl/cmd/diff:go_default_library",
35-
"//pkg/kubectl/cmd/drain:go_default_library",
36-
"//pkg/kubectl/cmd/edit:go_default_library",
37-
"//pkg/kubectl/cmd/exec:go_default_library",
38-
"//pkg/kubectl/cmd/explain:go_default_library",
39-
"//pkg/kubectl/cmd/expose:go_default_library",
4011
"//pkg/kubectl/cmd/get:go_default_library",
41-
"//pkg/kubectl/cmd/kustomize:go_default_library",
42-
"//pkg/kubectl/cmd/label:go_default_library",
43-
"//pkg/kubectl/cmd/logs:go_default_library",
44-
"//pkg/kubectl/cmd/options:go_default_library",
45-
"//pkg/kubectl/cmd/patch:go_default_library",
46-
"//pkg/kubectl/cmd/plugin:go_default_library",
47-
"//pkg/kubectl/cmd/portforward:go_default_library",
48-
"//pkg/kubectl/cmd/proxy:go_default_library",
49-
"//pkg/kubectl/cmd/replace:go_default_library",
50-
"//pkg/kubectl/cmd/rollingupdate:go_default_library",
51-
"//pkg/kubectl/cmd/rollout:go_default_library",
52-
"//pkg/kubectl/cmd/run:go_default_library",
53-
"//pkg/kubectl/cmd/scale:go_default_library",
54-
"//pkg/kubectl/cmd/set:go_default_library",
55-
"//pkg/kubectl/cmd/taint:go_default_library",
56-
"//pkg/kubectl/cmd/top:go_default_library",
57-
"//pkg/kubectl/cmd/version:go_default_library",
58-
"//pkg/kubectl/cmd/wait:go_default_library",
5912
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
6013
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
6114
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
15+
"//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library",
16+
"//staging/src/k8s.io/kubectl/pkg/cmd/annotate:go_default_library",
17+
"//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:go_default_library",
18+
"//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library",
19+
"//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library",
20+
"//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:go_default_library",
21+
"//staging/src/k8s.io/kubectl/pkg/cmd/certificates:go_default_library",
22+
"//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:go_default_library",
23+
"//staging/src/k8s.io/kubectl/pkg/cmd/completion:go_default_library",
24+
"//staging/src/k8s.io/kubectl/pkg/cmd/config:go_default_library",
25+
"//staging/src/k8s.io/kubectl/pkg/cmd/cp:go_default_library",
26+
"//staging/src/k8s.io/kubectl/pkg/cmd/create:go_default_library",
27+
"//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library",
28+
"//staging/src/k8s.io/kubectl/pkg/cmd/describe:go_default_library",
29+
"//staging/src/k8s.io/kubectl/pkg/cmd/diff:go_default_library",
30+
"//staging/src/k8s.io/kubectl/pkg/cmd/drain:go_default_library",
31+
"//staging/src/k8s.io/kubectl/pkg/cmd/edit:go_default_library",
32+
"//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
33+
"//staging/src/k8s.io/kubectl/pkg/cmd/explain:go_default_library",
34+
"//staging/src/k8s.io/kubectl/pkg/cmd/expose:go_default_library",
35+
"//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:go_default_library",
36+
"//staging/src/k8s.io/kubectl/pkg/cmd/label:go_default_library",
37+
"//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library",
38+
"//staging/src/k8s.io/kubectl/pkg/cmd/options:go_default_library",
39+
"//staging/src/k8s.io/kubectl/pkg/cmd/patch:go_default_library",
40+
"//staging/src/k8s.io/kubectl/pkg/cmd/plugin:go_default_library",
41+
"//staging/src/k8s.io/kubectl/pkg/cmd/portforward:go_default_library",
42+
"//staging/src/k8s.io/kubectl/pkg/cmd/proxy:go_default_library",
43+
"//staging/src/k8s.io/kubectl/pkg/cmd/replace:go_default_library",
44+
"//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate:go_default_library",
45+
"//staging/src/k8s.io/kubectl/pkg/cmd/rollout:go_default_library",
46+
"//staging/src/k8s.io/kubectl/pkg/cmd/run:go_default_library",
47+
"//staging/src/k8s.io/kubectl/pkg/cmd/scale:go_default_library",
48+
"//staging/src/k8s.io/kubectl/pkg/cmd/set:go_default_library",
49+
"//staging/src/k8s.io/kubectl/pkg/cmd/taint:go_default_library",
50+
"//staging/src/k8s.io/kubectl/pkg/cmd/top:go_default_library",
6251
"//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
52+
"//staging/src/k8s.io/kubectl/pkg/cmd/version:go_default_library",
53+
"//staging/src/k8s.io/kubectl/pkg/cmd/wait:go_default_library",
6354
"//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
6455
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
6556
"//vendor/github.com/spf13/cobra:go_default_library",
66-
"//vendor/github.com/spf13/pflag:go_default_library",
6757
],
6858
)
6959

7060
go_test(
7161
name = "go_default_test",
7262
srcs = ["cmd_test.go"],
73-
data = [
74-
"//api/openapi-spec",
75-
"//pkg/kubectl/cmd/plugin:testdata",
76-
"//test/e2e/testing-manifests:all-srcs",
77-
"//test/fixtures",
78-
],
63+
data = ["//pkg/kubectl/cmd/plugin/testdata"],
7964
embed = [":go_default_library"],
8065
deps = [
8166
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
@@ -87,57 +72,18 @@ filegroup(
8772
name = "package-srcs",
8873
srcs = glob(["**"]),
8974
tags = ["automanaged"],
75+
visibility = ["//visibility:private"],
9076
)
9177

9278
filegroup(
9379
name = "all-srcs",
9480
srcs = [
9581
":package-srcs",
96-
"//pkg/kubectl/cmd/annotate:all-srcs",
97-
"//pkg/kubectl/cmd/apiresources:all-srcs",
98-
"//pkg/kubectl/cmd/apply:all-srcs",
99-
"//pkg/kubectl/cmd/attach:all-srcs",
10082
"//pkg/kubectl/cmd/auth:all-srcs",
101-
"//pkg/kubectl/cmd/autoscale:all-srcs",
102-
"//pkg/kubectl/cmd/certificates:all-srcs",
103-
"//pkg/kubectl/cmd/clusterinfo:all-srcs",
104-
"//pkg/kubectl/cmd/completion:all-srcs",
105-
"//pkg/kubectl/cmd/config:all-srcs",
10683
"//pkg/kubectl/cmd/convert:all-srcs",
107-
"//pkg/kubectl/cmd/cp:all-srcs",
108-
"//pkg/kubectl/cmd/create:all-srcs",
109-
"//pkg/kubectl/cmd/delete:all-srcs",
110-
"//pkg/kubectl/cmd/describe:all-srcs",
111-
"//pkg/kubectl/cmd/diff:all-srcs",
112-
"//pkg/kubectl/cmd/drain:all-srcs",
113-
"//pkg/kubectl/cmd/edit:all-srcs",
114-
"//pkg/kubectl/cmd/exec:all-srcs",
115-
"//pkg/kubectl/cmd/explain:all-srcs",
116-
"//pkg/kubectl/cmd/expose:all-srcs",
11784
"//pkg/kubectl/cmd/get:all-srcs",
118-
"//pkg/kubectl/cmd/help:all-srcs",
119-
"//pkg/kubectl/cmd/kustomize:all-srcs",
120-
"//pkg/kubectl/cmd/label:all-srcs",
121-
"//pkg/kubectl/cmd/logs:all-srcs",
122-
"//pkg/kubectl/cmd/options:all-srcs",
123-
"//pkg/kubectl/cmd/patch:all-srcs",
124-
"//pkg/kubectl/cmd/plugin:all-srcs",
125-
"//pkg/kubectl/cmd/portforward:all-srcs",
126-
"//pkg/kubectl/cmd/proxy:all-srcs",
127-
"//pkg/kubectl/cmd/replace:all-srcs",
128-
"//pkg/kubectl/cmd/rollingupdate:all-srcs",
129-
"//pkg/kubectl/cmd/rollout:all-srcs",
130-
"//pkg/kubectl/cmd/run:all-srcs",
131-
"//pkg/kubectl/cmd/scale:all-srcs",
132-
"//pkg/kubectl/cmd/set:all-srcs",
133-
"//pkg/kubectl/cmd/taint:all-srcs",
134-
"//pkg/kubectl/cmd/testing:all-srcs",
135-
"//pkg/kubectl/cmd/top:all-srcs",
136-
"//pkg/kubectl/cmd/version:all-srcs",
137-
"//pkg/kubectl/cmd/wait:all-srcs",
85+
"//pkg/kubectl/cmd/plugin/testdata:all-srcs",
13886
],
13987
tags = ["automanaged"],
140-
visibility = [
141-
"//build/visible_to:pkg_kubectl_cmd_CONSUMERS",
142-
],
88+
visibility = ["//visibility:public"],
14389
)

‎pkg/kubectl/cmd/auth/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ go_test(
6363
srcs = ["cani_test.go"],
6464
embed = [":go_default_library"],
6565
deps = [
66-
"//pkg/kubectl/cmd/testing:go_default_library",
6766
"//staging/src/k8s.io/api/authorization/v1:go_default_library",
6867
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
6968
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
7069
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
7170
"//staging/src/k8s.io/client-go/rest:go_default_library",
7271
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",
72+
"//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
7373
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
7474
],
7575
)

‎pkg/kubectl/cmd/auth/cani_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/cli-runtime/pkg/genericclioptions"
3131
restclient "k8s.io/client-go/rest"
3232
"k8s.io/client-go/rest/fake"
33+
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
3334
"k8s.io/kubectl/pkg/scheme"
34-
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
3535
)
3636

3737
func TestRunAccessCheck(t *testing.T) {

0 commit comments

Comments
 (0)