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

pkg/kubelet/server/streaming/errors.go

@@ -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")

pkg/util/umask_windows.go

@@ -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")
 }