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

Merge pull request #89674 from superbrothers/fix-kubectl-alpha-debug 

Fix missing a shorthand for container flag of kubectl alpha debug

Kubernetes-commit: 6652347ceea958c0004ce959e8fd3137ff5ef064
This commit is contained in:
Kubernetes Publisher 2020-04-16 23:49:07 -07:00
parent 6f34ae560e 736b43aee9
commit 44044e1c83
4 changed files with 12 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

@ -572,7 +572,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2433a9db3db3"
"Rev": "6459cdd1b290"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -584,11 +584,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "4529075edf97"
"Rev": "b3b874faea7e"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "986da3785c57"
"Rev": "f5666d8c92f4"
},
{
"ImportPath": "k8s.io/component-base",

10
go.mod
View File

@ -34,10 +34,10 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200414061335-2433a9db3db3
k8s.io/api v0.0.0-20200416141345-6459cdd1b290
k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c
k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2
k8s.io/client-go v0.0.0-20200415181605-4529075edf97
k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e
k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35
@ -51,11 +51,11 @@ require (
replace (
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
k8s.io/api => k8s.io/api v0.0.0-20200414061335-2433a9db3db3
k8s.io/api => k8s.io/api v0.0.0-20200416141345-6459cdd1b290
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2
k8s.io/client-go => k8s.io/client-go v0.0.0-20200415181605-4529075edf97
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200410020940-986da3785c57
k8s.io/client-go => k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200416140956-f5666d8c92f4
k8s.io/component-base => k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b
k8s.io/metrics => k8s.io/metrics v0.0.0-20200410031643-1542edda33c0
)

6
go.sum
View File

@ -325,11 +325,11 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
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=
k8s.io/api v0.0.0-20200414061335-2433a9db3db3/go.mod h1:S9B4jsMc6M3MS++oeNW7L3ZGLfPUaKMbO/PUWQcC+gU=
k8s.io/api v0.0.0-20200416141345-6459cdd1b290/go.mod h1:S9B4jsMc6M3MS++oeNW7L3ZGLfPUaKMbO/PUWQcC+gU=
k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo=
k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2/go.mod h1:if8I7E6TpO/p/o/qgW+hlE1SiBfK4wJB59roqSaO1gQ=
k8s.io/client-go v0.0.0-20200415181605-4529075edf97/go.mod h1:lvrPTLA1B2exkinGQ+HtpDbMstS9LUs/YrD8xRFBUbk=
k8s.io/code-generator v0.0.0-20200410020940-986da3785c57/go.mod h1:921XK/cUtrTpn/F0nAhNaFjo8I7Kue1BIEtdxsYFt9I=
k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e/go.mod h1:vgr2vFke0wRBJ0wk/V4enjpRXaxESpiJJ3yM447SVoE=
k8s.io/code-generator v0.0.0-20200416140956-f5666d8c92f4/go.mod h1:921XK/cUtrTpn/F0nAhNaFjo8I7Kue1BIEtdxsYFt9I=
k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b/go.mod h1:grU+F0MqA5eYgNvtft1YM+zHsU4YH2WW18+1G97EZYQ=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

2
pkg/cmd/debug/debug.go
View File

@ -119,7 +119,7 @@ func NewCmdDebug(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.
func addDebugFlags(cmd *cobra.Command, opt *DebugOptions) {
cmd.Flags().BoolVar(&opt.ArgsOnly, "arguments-only", opt.ArgsOnly, i18n.T("If specified, everything after -- will be passed to the new container as Args instead of Command."))
cmd.Flags().BoolVar(&opt.Attach, "attach", opt.Attach, i18n.T("If true, wait for the Pod to start running, and then attach to the Pod as if 'kubectl attach ...' were called. Default false, unless '-i/--stdin' is set, in which case the default is true."))
cmd.Flags().StringVar(&opt.Container, "container", opt.Container, i18n.T("Container name to use for debug container."))
cmd.Flags().StringVarP(&opt.Container, "container", "c", opt.Container, i18n.T("Container name to use for debug container."))
cmd.Flags().StringToString("env", nil, i18n.T("Environment variables to set in the container."))
cmd.Flags().StringVar(&opt.Image, "image", opt.Image, i18n.T("Container image to use for debug container."))
cmd.MarkFlagRequired("image")