kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86693 from sallyom/silence-usage-on-error 

silence usage when required flag is not passed

Kubernetes-commit: c72d5fd2556f90669fc3321061dba658cad077cf
This commit is contained in:
Kubernetes Publisher 2020-01-02 08:47:40 -08:00
parent 5faa920af5 8eb193a6c1
commit e2c59440f3
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -592,11 +592,11 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "72223a9f9901" "Rev": "7dc09db16fb8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "3253b0a30d67" "Rev": "4d9f99a83526"
}, },
{ {
"ImportPath": "k8s.io/cli-runtime", "ImportPath": "k8s.io/cli-runtime",
@ -612,7 +612,7 @@
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "a6e74ff2e316" "Rev": "e498b4d116ab"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

12
go.mod
View File

@ -36,11 +36,11 @@ require (
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191221033533-72223a9f9901 k8s.io/api v0.0.0-20191230033939-7dc09db16fb8
k8s.io/apimachinery v0.0.0-20191221033353-3253b0a30d67 k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526
k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb
k8s.io/client-go v0.0.0-20191227015938-526b2fff5289 k8s.io/client-go v0.0.0-20191227015938-526b2fff5289
k8s.io/component-base v0.0.0-20191222114205-a6e74ff2e316 k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/metrics v0.0.0-20191222115248-b10799206b33 k8s.io/metrics v0.0.0-20191222115248-b10799206b33
@ -53,11 +53,11 @@ require (
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20191221033533-72223a9f9901 k8s.io/api => k8s.io/api v0.0.0-20191230033939-7dc09db16fb8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191221033353-3253b0a30d67 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb
k8s.io/client-go => k8s.io/client-go v0.0.0-20191227015938-526b2fff5289 k8s.io/client-go => k8s.io/client-go v0.0.0-20191227015938-526b2fff5289
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46
k8s.io/component-base => k8s.io/component-base v0.0.0-20191222114205-a6e74ff2e316 k8s.io/component-base => k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab
k8s.io/metrics => k8s.io/metrics v0.0.0-20191222115248-b10799206b33 k8s.io/metrics => k8s.io/metrics v0.0.0-20191222115248-b10799206b33
) )

6
go.sum
View File

@ -323,12 +323,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191221033533-72223a9f9901/go.mod h1:cUvsxRRcutO57eFbvcbKsHasCbJP9NF8JA7Q9icijjI= k8s.io/api v0.0.0-20191230033939-7dc09db16fb8/go.mod h1:cUvsxRRcutO57eFbvcbKsHasCbJP9NF8JA7Q9icijjI=
k8s.io/apimachinery v0.0.0-20191221033353-3253b0a30d67/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s= k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s=
k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb/go.mod h1:2x8tHwCmM+O1blOlznqxX+TTxgww9kXrSrWdZdeUezQ= k8s.io/cli-runtime v0.0.0-20191222115356-e2d80aead1eb/go.mod h1:2x8tHwCmM+O1blOlznqxX+TTxgww9kXrSrWdZdeUezQ=
k8s.io/client-go v0.0.0-20191227015938-526b2fff5289/go.mod h1:lGXQyJl/X4GntUREa90IWFXpZ3q+6WGSUQRYmHc5HuU= k8s.io/client-go v0.0.0-20191227015938-526b2fff5289/go.mod h1:lGXQyJl/X4GntUREa90IWFXpZ3q+6WGSUQRYmHc5HuU=
k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao= k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao=
k8s.io/component-base v0.0.0-20191222114205-a6e74ff2e316/go.mod h1:ViOf8T91+NAEd+AXLoJFNU38SbS3M2XRXw65+MupvbU= k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab/go.mod h1:z21BE1lrzlWfjf1EP+UOy8xKp199XmlIu34NLrpuKDw=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

1
pkg/util/templates/templater.go
View File

@ -45,6 +45,7 @@ func ActsAsRootCommand(cmd *cobra.Command, filters []string, groups ...CommandGr
Filtered: filters, Filtered: filters,
} }
cmd.SetFlagErrorFunc(templater.FlagErrorFunc()) cmd.SetFlagErrorFunc(templater.FlagErrorFunc())
cmd.SilenceUsage = true
cmd.SetUsageFunc(templater.UsageFunc()) cmd.SetUsageFunc(templater.UsageFunc())
cmd.SetHelpFunc(templater.HelpFunc()) cmd.SetHelpFunc(templater.HelpFunc())
return templater return templater