github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39463 from NickrenREN/kubelet-stream-error-drop 

Automatic merge from submit-queue (batch tested with PRs 39768, 39463)

modify Umask() and delete ErrorTimeout function

ErrorTimeout() is never used,remove it. And modify Umask() args
pull/6/head
Kubernetes Submit Queue 2017-01-11 20:57:46 -08:00 committed by GitHub
parent 12b344aa7c ad1f0d30e0
commit 2df5bb41fb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/server/streaming/errors.go
View File

@ -20,7 +20,6 @@ import (
"fmt"
"net/http"
"strconv"
"time"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@ -30,10 +29,6 @@ func ErrorStreamingDisabled(method string) error {
return grpc.Errorf(codes.NotFound, fmt.Sprintf("streaming method %s disabled", method))
}
func ErrorTimeout(op string, timeout time.Duration) error {
return grpc.Errorf(codes.DeadlineExceeded, fmt.Sprintf("%s timed out after %s", op, timeout.String()))
}
// The error returned when the maximum number of in-flight requests is exceeded.
func ErrorTooManyInFlight() error {
return grpc.Errorf(codes.ResourceExhausted, "maximum number of in-flight requests exceeded")

2
pkg/util/umask_windows.go
View File

@ -22,6 +22,6 @@ import (
"errors"
)
func Umask(mask int) (old int, err error) {
func Umask(mask int) (int, error) {
return 0, errors.New("platform and architecture is not supported")
}