mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
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 ```
This commit is contained in:
commit
fdb3b2af70
@ -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:
|
||||
|
@ -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.ExitStatus())
|
||||
handleErr(err.Error(), err.ExitStatus())
|
||||
default: // for any other error type
|
||||
msg, ok := StandardErrorMessage(err)
|
||||
if !ok {
|
||||
|
@ -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,
|
||||
},
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user