From 5aa58efe070e97e4f6cec0a1b1abefb121ee7759 Mon Sep 17 00:00:00 2001
From: xichengliudui <1693291525@qq.com>
Date: Tue, 12 Feb 2019 07:09:42 -0500
Subject: [PATCH 1/2] Fix golint failures

update pull request
---
 hack/.golint_failures                          | 3 ---
 pkg/kubelet/server/remotecommand/doc.go        | 2 +-
 pkg/kubelet/server/remotecommand/httpstream.go | 4 ++--
 pkg/kubelet/util/queue/work_queue.go           | 1 +
 pkg/kubelet/util/sliceutils/sliceutils.go      | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hack/.golint_failures b/hack/.golint_failures
index 682576a48a5..611b6548ce1 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -217,7 +217,6 @@ pkg/kubelet/remote
 pkg/kubelet/secret
 pkg/kubelet/server
 pkg/kubelet/server/portforward
-pkg/kubelet/server/remotecommand
 pkg/kubelet/server/stats
 pkg/kubelet/server/streaming
 pkg/kubelet/stats
@@ -228,8 +227,6 @@ pkg/kubelet/types
 pkg/kubelet/util
 pkg/kubelet/util/cache
 pkg/kubelet/util/pluginwatcher
-pkg/kubelet/util/queue
-pkg/kubelet/util/sliceutils
 pkg/kubemark
 pkg/master
 pkg/master/controller/crdregistration
diff --git a/pkg/kubelet/server/remotecommand/doc.go b/pkg/kubelet/server/remotecommand/doc.go
index 24f9393abfb..a78404cb8bb 100644
--- a/pkg/kubelet/server/remotecommand/doc.go
+++ b/pkg/kubelet/server/remotecommand/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// package remotecommand contains functions related to executing commands in and attaching to pods.
+// Package remotecommand contains functions related to executing commands in and attaching to pods.
 package remotecommand // import "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/server/remotecommand/httpstream.go
index 8bff323ec7a..df5c8eee36d 100644
--- a/pkg/kubelet/server/remotecommand/httpstream.go
+++ b/pkg/kubelet/server/remotecommand/httpstream.go
@@ -108,7 +108,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
 	if wsstream.IsWebSocketRequest(req) {
 		ctx, ok = createWebSocketStreams(req, w, opts, idleTimeout)
 	} else {
-		ctx, ok = createHttpStreamStreams(req, w, opts, supportedStreamProtocols, idleTimeout, streamCreationTimeout)
+		ctx, ok = createHTTPStreamStreams(req, w, opts, supportedStreamProtocols, idleTimeout, streamCreationTimeout)
 	}
 	if !ok {
 		return nil, false
@@ -122,7 +122,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
 	return ctx, true
 }
 
-func createHttpStreamStreams(req *http.Request, w http.ResponseWriter, opts *Options, supportedStreamProtocols []string, idleTimeout, streamCreationTimeout time.Duration) (*context, bool) {
+func createHTTPStreamStreams(req *http.Request, w http.ResponseWriter, opts *Options, supportedStreamProtocols []string, idleTimeout, streamCreationTimeout time.Duration) (*context, bool) {
 	protocol, err := httpstream.Handshake(req, w, supportedStreamProtocols)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
diff --git a/pkg/kubelet/util/queue/work_queue.go b/pkg/kubelet/util/queue/work_queue.go
index 4075562f05c..f476e27b643 100644
--- a/pkg/kubelet/util/queue/work_queue.go
+++ b/pkg/kubelet/util/queue/work_queue.go
@@ -41,6 +41,7 @@ type basicWorkQueue struct {
 
 var _ WorkQueue = &basicWorkQueue{}
 
+// NewBasicWorkQueue instantiate the queue and return WorkQueue
 func NewBasicWorkQueue(clock clock.Clock) WorkQueue {
 	queue := make(map[types.UID]time.Time)
 	return &basicWorkQueue{queue: queue, clock: clock}
diff --git a/pkg/kubelet/util/sliceutils/sliceutils.go b/pkg/kubelet/util/sliceutils/sliceutils.go
index ff9fb56031f..4f822c3c0b3 100644
--- a/pkg/kubelet/util/sliceutils/sliceutils.go
+++ b/pkg/kubelet/util/sliceutils/sliceutils.go
@@ -21,6 +21,7 @@ import (
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 
+// StringInSlice traversal and determine return bool
 func StringInSlice(s string, list []string) bool {
 	for _, v := range list {
 		if v == s {

From d1d54f81ecf64712d7aa3848efd1c71551feb36b Mon Sep 17 00:00:00 2001
From: xichengliudui <1693291525@qq.com>
Date: Tue, 12 Feb 2019 12:10:43 -0500
Subject: [PATCH 2/2] update pull request

update pull request
---
 pkg/kubelet/util/queue/work_queue.go      | 2 +-
 pkg/kubelet/util/sliceutils/sliceutils.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kubelet/util/queue/work_queue.go b/pkg/kubelet/util/queue/work_queue.go
index f476e27b643..5c66968c7f7 100644
--- a/pkg/kubelet/util/queue/work_queue.go
+++ b/pkg/kubelet/util/queue/work_queue.go
@@ -41,7 +41,7 @@ type basicWorkQueue struct {
 
 var _ WorkQueue = &basicWorkQueue{}
 
-// NewBasicWorkQueue instantiate the queue and return WorkQueue
+// NewBasicWorkQueue returns a new basic WorkQueue with the provided clock
 func NewBasicWorkQueue(clock clock.Clock) WorkQueue {
 	queue := make(map[types.UID]time.Time)
 	return &basicWorkQueue{queue: queue, clock: clock}
diff --git a/pkg/kubelet/util/sliceutils/sliceutils.go b/pkg/kubelet/util/sliceutils/sliceutils.go
index 4f822c3c0b3..359272eb401 100644
--- a/pkg/kubelet/util/sliceutils/sliceutils.go
+++ b/pkg/kubelet/util/sliceutils/sliceutils.go
@@ -21,7 +21,7 @@ import (
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 
-// StringInSlice traversal and determine return bool
+// StringInSlice returns true if s is in list
 func StringInSlice(s string, list []string) bool {
 	for _, v := range list {
 		if v == s {