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

Merge pull request #6571 from kargakis/describe-fix

Browse Source 
describe: Support resource type/name syntax
This commit is contained in:
Vish Kannan 2015-04-09 10:54:24 -07:00
commit 2215a64567
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,10 @@ import (
"fmt" "fmt"
"io" "io"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra" "github.com/spf13/cobra"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
) )
func NewCmdDescribe(f *cmdutil.Factory, out io.Writer) *cobra.Command { func NewCmdDescribe(f *cmdutil.Factory, out io.Writer) *cobra.Command {
@ -46,9 +48,18 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s
return err return err
} }
mapper, _ := f.Object() mapper, typer := f.Object()
// TODO: use resource.Builder instead r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).
mapping, namespace, name, err := cmdutil.ResourceFromArgs(cmd, args, mapper, cmdNamespace) ContinueOnError().
NamespaceParam(cmdNamespace).DefaultNamespace().
ResourceTypeOrNameArgs(false, args...).
Flatten().
Do()
err = r.Err()
if err != nil {
return err
}
mapping, err := r.ResourceMapping()
if err != nil { if err != nil {
return err return err
} }
@ -57,8 +68,13 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s
if err != nil { if err != nil {
return err return err
} }
infos, err := r.Infos()
if err != nil {
return err
}
info := infos[0]
s, err := describer.Describe(namespace, name) s, err := describer.Describe(info.Namespace, info.Name)
if err != nil { if err != nil {
return err return err
} }