Merge pull request #48578 from fabianofranz/run_output_message_on_container_error

Automatic merge from submit-queue (batch tested with PRs 48578, 48895, 48958) run must output message on container error **What this PR does / why we need it**: `kubectl run` must output a message (instead of just exiting with an error code) on container error. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/openshift/origin/issues/15031 found in OpenShift **Release note**: ```release-note NONE ```

Merge pull request #48578 from fabianofranz/run_output_message_on_container_error
fdb3b2af · Kubernetes Submit Queue · GitHub · 2610b9cf · f623b9b4 · fdb3b2af
Commit fdb3b2af authored Jul 14, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

helpers.go pkg/kubectl/cmd/util/helpers.go +1 -2

helpers_test.go pkg/kubectl/cmd/util/helpers_test.go +1 -1

No files found.
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -362,7 +362,7 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c
 				return unknownRcErr
 			}
 			return uexec.CodeExitError{
-				Err:  fmt.Errorf("pod %s/%s terminated", pod.Namespace, pod.Name),
+				Err:  fmt.Errorf("pod %s/%s terminated (%s)\n%s", pod.Namespace, pod.Name, pod.Status.ContainerStatuses[0].State.Terminated.Reason, pod.Status.ContainerStatuses[0].State.Terminated.Message),
 				Code: int(rc),
 			}
 		default:

--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -166,8 +166,7 @@ func checkErr(err error, handleErr func(string, int)) {
 		case utilerrors.Aggregate:
 			handleErr(MultipleErrors(``, err.Errors()), DefaultErrorExitCode)
 		case utilexec.ExitError:
-			// do not print anything, only terminate with given error
+			handleErr(err.Error(), err.ExitStatus())
-			handleErr("", err.ExitStatus())
 		default: // for any other error type
 			msg, ok := StandardErrorMessage(err)
 			if !ok {

--- a/pkg/kubectl/cmd/util/helpers_test.go
+++ b/pkg/kubectl/cmd/util/helpers_test.go
@@ -267,7 +267,7 @@ func TestCheckExitError(t *testing.T) {
 	testCheckError(t, []checkErrTestCase{
 		{
 			uexec.CodeExitError{Err: fmt.Errorf("pod foo/bar terminated"), Code: 42},
-			"",
+			"pod foo/bar terminated",
 			42,
 		},
 	})