github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add return code support to kubectl-exec and -run

Browse Source
This commit is contained in:
bindata-mockuser
2016-08-08 20:25:10 +02:00
committed by Dr. Stefan Schimanski
parent 6dcb0c9130
commit e792d4117d
19 changed files with 666 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/server/remotecommand/attach.go
View File

@@ -17,12 +17,13 @@ limitations under the License.
package remotecommand
import (
"errors"
"fmt"
"io"
"net/http"
"time"
apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/term"
@@ -47,8 +48,12 @@ func ServeAttach(w http.ResponseWriter, req *http.Request, attacher Attacher, po
err := attacher.AttachContainer(podName, uid, container, ctx.stdinStream, ctx.stdoutStream, ctx.stderrStream, ctx.tty, ctx.resizeChan)
if err != nil {
msg := fmt.Sprintf("error attaching to container: %v", err)
runtime.HandleError(errors.New(msg))
fmt.Fprint(ctx.errorStream, msg)
err = fmt.Errorf("error attaching to container: %v", err)
runtime.HandleError(err)
ctx.writeStatus(apierrors.NewInternalError(err))
} else {
ctx.writeStatus(&apierrors.StatusError{ErrStatus: unversioned.Status{
Status: unversioned.StatusSuccess,
}})
}
}