From b48e7b22183c2f05cb7a388b27d572f95e481aed Mon Sep 17 00:00:00 2001
From: hangaoshuai <hangaoshuai1@huawei.com>
Date: Mon, 26 Mar 2018 19:17:48 +0800
Subject: [PATCH] use status.Errorf instead of Deprecated func grpc.Errorf

---
 pkg/kubelet/server/streaming/BUILD     |  1 +
 pkg/kubelet/server/streaming/errors.go |  5 +++--
 pkg/kubelet/server/streaming/server.go | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD
index 64e1760226f..36150aef245 100644
--- a/pkg/kubelet/server/streaming/BUILD
+++ b/pkg/kubelet/server/streaming/BUILD
@@ -21,6 +21,7 @@ go_library(
         "//vendor/github.com/emicklei/go-restful:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/google.golang.org/grpc/codes:go_default_library",
+        "//vendor/google.golang.org/grpc/status:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library",
diff --git a/pkg/kubelet/server/streaming/errors.go b/pkg/kubelet/server/streaming/errors.go
index 9f16b4eb201..62bcef79000 100644
--- a/pkg/kubelet/server/streaming/errors.go
+++ b/pkg/kubelet/server/streaming/errors.go
@@ -23,15 +23,16 @@ import (
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func ErrorStreamingDisabled(method string) error {
-	return grpc.Errorf(codes.NotFound, fmt.Sprintf("streaming method %s disabled", method))
+	return status.Errorf(codes.NotFound, fmt.Sprintf("streaming method %s disabled", method))
 }
 
 // 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")
+	return status.Errorf(codes.ResourceExhausted, "maximum number of in-flight requests exceeded")
 }
 
 // Translates a CRI streaming error into an appropriate HTTP response.
diff --git a/pkg/kubelet/server/streaming/server.go b/pkg/kubelet/server/streaming/server.go
index 64bd52f3355..ae1c046b025 100644
--- a/pkg/kubelet/server/streaming/server.go
+++ b/pkg/kubelet/server/streaming/server.go
@@ -25,8 +25,8 @@ import (
 	"path"
 	"time"
 
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	restful "github.com/emicklei/go-restful"
 
@@ -160,15 +160,15 @@ type server struct {
 
 func validateExecRequest(req *runtimeapi.ExecRequest) error {
 	if req.ContainerId == "" {
-		return grpc.Errorf(codes.InvalidArgument, "missing required container_id")
+		return status.Errorf(codes.InvalidArgument, "missing required container_id")
 	}
 	if req.Tty && req.Stderr {
 		// If TTY is set, stderr cannot be true because multiplexing is not
 		// supported.
-		return grpc.Errorf(codes.InvalidArgument, "tty and stderr cannot both be true")
+		return status.Errorf(codes.InvalidArgument, "tty and stderr cannot both be true")
 	}
 	if !req.Stdin && !req.Stdout && !req.Stderr {
-		return grpc.Errorf(codes.InvalidArgument, "one of stdin, stdout, or stderr must be set")
+		return status.Errorf(codes.InvalidArgument, "one of stdin, stdout, or stderr must be set")
 	}
 	return nil
 }
@@ -188,15 +188,15 @@ func (s *server) GetExec(req *runtimeapi.ExecRequest) (*runtimeapi.ExecResponse,
 
 func validateAttachRequest(req *runtimeapi.AttachRequest) error {
 	if req.ContainerId == "" {
-		return grpc.Errorf(codes.InvalidArgument, "missing required container_id")
+		return status.Errorf(codes.InvalidArgument, "missing required container_id")
 	}
 	if req.Tty && req.Stderr {
 		// If TTY is set, stderr cannot be true because multiplexing is not
 		// supported.
-		return grpc.Errorf(codes.InvalidArgument, "tty and stderr cannot both be true")
+		return status.Errorf(codes.InvalidArgument, "tty and stderr cannot both be true")
 	}
 	if !req.Stdin && !req.Stdout && !req.Stderr {
-		return grpc.Errorf(codes.InvalidArgument, "one of stdin, stdout, and stderr must be set")
+		return status.Errorf(codes.InvalidArgument, "one of stdin, stdout, and stderr must be set")
 	}
 	return nil
 }
@@ -216,7 +216,7 @@ func (s *server) GetAttach(req *runtimeapi.AttachRequest) (*runtimeapi.AttachRes
 
 func (s *server) GetPortForward(req *runtimeapi.PortForwardRequest) (*runtimeapi.PortForwardResponse, error) {
 	if req.PodSandboxId == "" {
-		return nil, grpc.Errorf(codes.InvalidArgument, "missing required pod_sandbox_id")
+		return nil, status.Errorf(codes.InvalidArgument, "missing required pod_sandbox_id")
 	}
 	token, err := s.cache.Insert(req)
 	if err != nil {