expose: Use separate parameters for default and custom name

This commit is contained in:
kargakis
2015-05-26 14:03:11 +02:00
parent 6fa2777e26
commit 6c85040cef
4 changed files with 77 additions and 22 deletions

View File

@@ -98,6 +98,9 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
if err != nil {
return err
}
if len(infos) > 1 {
return fmt.Errorf("multiple resources provided: %v", args)
}
info := infos[0]
// Get the input object
@@ -118,10 +121,7 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
}
names := generator.ParamNames()
params := kubectl.MakeParams(cmd, names)
params["name"] = cmdutil.GetFlagString(cmd, "name")
if len(params["name"]) == 0 {
params["name"] = info.Name
}
params["default-name"] = info.Name
if s, found := params["selector"]; !found || len(s) == 0 || cmdutil.GetFlagInt(cmd, "port") < 1 {
if len(s) == 0 {
s, err := f.PodSelectorForObject(inputObject)