Merge pull request #43618 from xilabao/fix-kubectl-run-output

Automatic merge from submit-queue (batch tested with PRs 44970, 43618)

fix kubectl run output

fixes https://github.com/kubernetes/kubernetes/issues/40440
This commit is contained in:
Kubernetes Submit Queue 2017-04-26 22:58:13 -07:00 committed by GitHub
commit 65838085b0

View File

@ -563,7 +563,14 @@ func generateService(f cmdutil.Factory, cmd *cobra.Command, args []string, servi
}
if cmdutil.GetFlagString(cmd, "output") != "" || cmdutil.GetDryRunFlag(cmd) {
return f.PrintObject(cmd, mapper, obj, out)
err := f.PrintObject(cmd, mapper, obj, out)
if err != nil {
return err
}
if cmdutil.GetFlagString(cmd, "output") == "yaml" {
fmt.Fprintln(out, "---")
}
return nil
}
cmdutil.PrintSuccess(mapper, false, out, mapping.Resource, args[0], cmdutil.GetDryRunFlag(cmd), "created")