Merge pull request #38429 from duglin/removeDelete

Automatic merge from submit-queue (batch tested with PRs 37860, 38429, 38451, 36050, 38463) Remove "pod xxx deleted" message from kubectl run --rm This is a follow-on to https://github.com/kubernetes/kubernetes/issues/28695 Its unnecessary to print the message when the user asked for it. We should only show a msg (error) when we didn't do what they asked. Also showing this in a "kubectl run" is bad because it then gets appended to the user's output and they would then have to strip it off if they want to use the output in some follow-on processing. Signed-off-by: Doug Davis <dug@us.ibm.com> ```release-note kubectl run --rm no longer prints "pod xxx deleted" ```

Merge pull request #38429 from duglin/removeDelete
b9536688 · Kubernetes Submit Queue · GitHub · 63da5cfe · 24fbba39 · b9536688
Commit b9536688 authored Dec 09, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

run.go pkg/kubectl/cmd/run.go +7 -1

No files found.
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -325,7 +325,13 @@ func Run(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cobr
 				ResourceNames(mapping.Resource, name).
 				Flatten().
 				Do()
-			err = ReapResult(r, f, cmdOut, true, true, 0, -1, false, false, mapper, quiet)
+			// Note: we pass in "true" for the "quiet" parameter because
+			// ReadResult will only print one thing based on the "quiet"
+			// flag, and that's the "pod xxx deleted" message. If they
+			// asked for us to remove the pod (via --rm) then telling them
+			// its been deleted is unnecessary since that's what they asked
+			// for. We should only print something if the "rm" fails.
+			err = ReapResult(r, f, cmdOut, true, true, 0, -1, false, false, mapper, true)
 			if err != nil {
 				return err
 			}