Skip to content

K
k3s
Commit 8efc62bc authored by hurf's avatar hurf
Browse files
Options

Simplify default output of "expose" command

Use simple output string such as "rc nginx exposed" to show the result. Users can still use options like "-o yaml" to view detailed result. IP will be printed with detailed result now.
parent 96e0ed57
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 11 deletions
pkg/kubectl/cmd/expose.go
View file @ 8efc62bc
...@@ -191,21 +191,28 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str ...@@ -191,21 +191,28 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
} }
} }
resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()}
info, err = resourceMapper.InfoForObject(object)
if err != nil {
return err
}
// TODO: extract this flag to a central location, when such a location exists. // TODO: extract this flag to a central location, when such a location exists.
if !cmdutil.GetFlagBool(cmd, "dry-run") { if cmdutil.GetFlagBool(cmd, "dry-run") {
resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()} fmt.Fprintln(out, "running in dry-run mode...")
info, err := resourceMapper.InfoForObject(object) } else {
if err != nil {
return err
}
data, err := info.Mapping.Codec.Encode(object) data, err := info.Mapping.Codec.Encode(object)
if err != nil { if err != nil {
return err return err
} }
_, err = resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, data) object, err = resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, data)
if err != nil { if err != nil {
return err return err
} }
} }
return f.PrintObject(cmd, object, out) outputFormat := cmdutil.GetFlagString(cmd, "output")
if outputFormat != "" {
return f.PrintObject(cmd, object, out)
}
cmdutil.PrintSuccess(mapper, false, out, info.Mapping.Resource, info.Name, "exposed")
return nil
} }
pkg/kubectl/cmd/label.go
View file @ 8efc62bc
...@@ -242,11 +242,10 @@ func RunLabel(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri ...@@ -242,11 +242,10 @@ func RunLabel(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri
} }
} }
outputFormat := cmdutil.GetFlagString(cmd, "output") outputFormat := cmdutil.GetFlagString(cmd, "output")
if outputFormat == "" { if outputFormat != "" {
cmdutil.PrintSuccess(mapper, false, out, info.Mapping.Resource, info.Name, "labeled")
} else {
return f.PrintObject(cmd, outputObj, out) return f.PrintObject(cmd, outputObj, out)
} }
cmdutil.PrintSuccess(mapper, false, out, info.Mapping.Resource, info.Name, "labeled")
return nil return nil
}) })
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment