Skip to content

Commit 5fcf9bd

Browse files
committed
Update vendor modules to reflect code move to staging
1 parent 58b59ae commit 5fcf9bd

File tree

5 files changed

+77
-7
lines changed

5 files changed

+77
-7
lines changed

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
)

pkg/kubectl/cmd/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ filegroup(
8282
"//pkg/kubectl/cmd/auth:all-srcs",
8383
"//pkg/kubectl/cmd/convert:all-srcs",
8484
"//pkg/kubectl/cmd/get:all-srcs",
85+
"//pkg/kubectl/cmd/plugin/testdata:all-srcs",
8586
],
8687
tags = ["automanaged"],
8788
visibility = ["//visibility:public"],

staging/src/k8s.io/kubectl/go.mod

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,43 @@ require (
88
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
99
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
1010
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
11+
github.com/davecgh/go-spew v1.1.1
12+
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
13+
github.com/docker/distribution v2.7.1+incompatible
1114
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
1215
github.com/evanphx/json-patch v4.2.0+incompatible
1316
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
1417
github.com/fatih/camelcase v1.0.0
1518
github.com/go-openapi/spec v0.19.2
19+
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
20+
github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
21+
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
1622
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d
23+
github.com/jonboulle/clockwork v0.1.0
1724
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
25+
github.com/lithammer/dedent v1.1.0
1826
github.com/mitchellh/go-wordwrap v1.0.0
1927
github.com/onsi/ginkgo v1.8.0
2028
github.com/onsi/gomega v1.5.0
29+
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
2130
github.com/russross/blackfriday v1.5.2
2231
github.com/sirupsen/logrus v1.4.2 // indirect
2332
github.com/spf13/cobra v0.0.4
2433
github.com/spf13/pflag v1.0.3
34+
github.com/stretchr/testify v1.3.0
2535
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
2636
gopkg.in/yaml.v2 v2.2.2
2737
gotest.tools v2.2.0+incompatible // indirect
2838
k8s.io/api v0.0.0
2939
k8s.io/apimachinery v0.0.0
3040
k8s.io/cli-runtime v0.0.0
3141
k8s.io/client-go v0.0.0
42+
k8s.io/component-base v0.0.0
3243
k8s.io/klog v0.3.1
3344
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
3445
k8s.io/metrics v0.0.0
3546
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
47+
sigs.k8s.io/kustomize v2.0.3+incompatible
3648
sigs.k8s.io/yaml v1.1.0
3749
)
3850

@@ -48,6 +60,7 @@ replace (
4860
k8s.io/cli-runtime => ../cli-runtime
4961
k8s.io/client-go => ../client-go
5062
k8s.io/code-generator => ../code-generator
63+
k8s.io/component-base => ../component-base
5164
k8s.io/kubectl => ../kubectl
5265
k8s.io/metrics => ../metrics
5366
)

staging/src/k8s.io/kubectl/go.sum

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,6 @@ k8s.io/apimachinery/pkg/util/remotecommand
11691169
k8s.io/apimachinery/pkg/util/runtime
11701170
k8s.io/apimachinery/pkg/util/sets
11711171
k8s.io/apimachinery/pkg/util/strategicpatch
1172-
k8s.io/apimachinery/pkg/util/strategicpatch/testing
11731172
k8s.io/apimachinery/pkg/util/uuid
11741173
k8s.io/apimachinery/pkg/util/validation
11751174
k8s.io/apimachinery/pkg/util/validation/field
@@ -1650,10 +1649,50 @@ k8s.io/kube-proxy/config/v1alpha1
16501649
k8s.io/kube-scheduler/config/v1alpha1
16511650
# k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
16521651
k8s.io/kubectl/pkg/apps
1652+
k8s.io/kubectl/pkg/cmd
1653+
k8s.io/kubectl/pkg/cmd/annotate
1654+
k8s.io/kubectl/pkg/cmd/apiresources
1655+
k8s.io/kubectl/pkg/cmd/apply
1656+
k8s.io/kubectl/pkg/cmd/attach
1657+
k8s.io/kubectl/pkg/cmd/autoscale
1658+
k8s.io/kubectl/pkg/cmd/certificates
1659+
k8s.io/kubectl/pkg/cmd/clusterinfo
1660+
k8s.io/kubectl/pkg/cmd/completion
1661+
k8s.io/kubectl/pkg/cmd/config
1662+
k8s.io/kubectl/pkg/cmd/cp
1663+
k8s.io/kubectl/pkg/cmd/create
1664+
k8s.io/kubectl/pkg/cmd/delete
1665+
k8s.io/kubectl/pkg/cmd/describe
1666+
k8s.io/kubectl/pkg/cmd/diff
1667+
k8s.io/kubectl/pkg/cmd/drain
1668+
k8s.io/kubectl/pkg/cmd/edit
1669+
k8s.io/kubectl/pkg/cmd/exec
1670+
k8s.io/kubectl/pkg/cmd/explain
1671+
k8s.io/kubectl/pkg/cmd/expose
1672+
k8s.io/kubectl/pkg/cmd/kustomize
1673+
k8s.io/kubectl/pkg/cmd/label
1674+
k8s.io/kubectl/pkg/cmd/logs
1675+
k8s.io/kubectl/pkg/cmd/options
1676+
k8s.io/kubectl/pkg/cmd/patch
1677+
k8s.io/kubectl/pkg/cmd/plugin
1678+
k8s.io/kubectl/pkg/cmd/portforward
1679+
k8s.io/kubectl/pkg/cmd/proxy
1680+
k8s.io/kubectl/pkg/cmd/replace
1681+
k8s.io/kubectl/pkg/cmd/rollingupdate
1682+
k8s.io/kubectl/pkg/cmd/rollout
1683+
k8s.io/kubectl/pkg/cmd/run
1684+
k8s.io/kubectl/pkg/cmd/scale
1685+
k8s.io/kubectl/pkg/cmd/set
1686+
k8s.io/kubectl/pkg/cmd/set/env
1687+
k8s.io/kubectl/pkg/cmd/taint
1688+
k8s.io/kubectl/pkg/cmd/testing
1689+
k8s.io/kubectl/pkg/cmd/top
16531690
k8s.io/kubectl/pkg/cmd/util
16541691
k8s.io/kubectl/pkg/cmd/util/editor
16551692
k8s.io/kubectl/pkg/cmd/util/editor/crlf
16561693
k8s.io/kubectl/pkg/cmd/util/sanity
1694+
k8s.io/kubectl/pkg/cmd/version
1695+
k8s.io/kubectl/pkg/cmd/wait
16571696
k8s.io/kubectl/pkg/describe
16581697
k8s.io/kubectl/pkg/describe/versioned
16591698
k8s.io/kubectl/pkg/drain

0 commit comments

Comments
 (0)