Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d61e8785
Unverified
Commit
d61e8785
authored
Feb 19, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #73997 from xichengliudui/fixlintcode
Fix golint failures
parents
a887ae83
d1d54f81
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
.golint_failures
hack/.golint_failures
+0
-3
doc.go
pkg/kubelet/server/remotecommand/doc.go
+1
-1
httpstream.go
pkg/kubelet/server/remotecommand/httpstream.go
+2
-2
work_queue.go
pkg/kubelet/util/queue/work_queue.go
+1
-0
sliceutils.go
pkg/kubelet/util/sliceutils/sliceutils.go
+1
-0
No files found.
hack/.golint_failures
View file @
d61e8785
...
@@ -215,7 +215,6 @@ pkg/kubelet/remote
...
@@ -215,7 +215,6 @@ pkg/kubelet/remote
pkg/kubelet/secret
pkg/kubelet/secret
pkg/kubelet/server
pkg/kubelet/server
pkg/kubelet/server/portforward
pkg/kubelet/server/portforward
pkg/kubelet/server/remotecommand
pkg/kubelet/server/stats
pkg/kubelet/server/stats
pkg/kubelet/server/streaming
pkg/kubelet/server/streaming
pkg/kubelet/stats
pkg/kubelet/stats
...
@@ -225,8 +224,6 @@ pkg/kubelet/sysctl
...
@@ -225,8 +224,6 @@ pkg/kubelet/sysctl
pkg/kubelet/types
pkg/kubelet/types
pkg/kubelet/util
pkg/kubelet/util
pkg/kubelet/util/pluginwatcher
pkg/kubelet/util/pluginwatcher
pkg/kubelet/util/queue
pkg/kubelet/util/sliceutils
pkg/kubemark
pkg/kubemark
pkg/master
pkg/master
pkg/master/controller/crdregistration
pkg/master/controller/crdregistration
...
...
pkg/kubelet/server/remotecommand/doc.go
View file @
d61e8785
...
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
...
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
*/
*/
//
p
ackage remotecommand contains functions related to executing commands in and attaching to pods.
//
P
ackage remotecommand contains functions related to executing commands in and attaching to pods.
package
remotecommand
// import "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
package
remotecommand
// import "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
pkg/kubelet/server/remotecommand/httpstream.go
View file @
d61e8785
...
@@ -108,7 +108,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
...
@@ -108,7 +108,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
if
wsstream
.
IsWebSocketRequest
(
req
)
{
if
wsstream
.
IsWebSocketRequest
(
req
)
{
ctx
,
ok
=
createWebSocketStreams
(
req
,
w
,
opts
,
idleTimeout
)
ctx
,
ok
=
createWebSocketStreams
(
req
,
w
,
opts
,
idleTimeout
)
}
else
{
}
else
{
ctx
,
ok
=
createH
ttp
StreamStreams
(
req
,
w
,
opts
,
supportedStreamProtocols
,
idleTimeout
,
streamCreationTimeout
)
ctx
,
ok
=
createH
TTP
StreamStreams
(
req
,
w
,
opts
,
supportedStreamProtocols
,
idleTimeout
,
streamCreationTimeout
)
}
}
if
!
ok
{
if
!
ok
{
return
nil
,
false
return
nil
,
false
...
@@ -122,7 +122,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
...
@@ -122,7 +122,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
return
ctx
,
true
return
ctx
,
true
}
}
func
createH
ttp
StreamStreams
(
req
*
http
.
Request
,
w
http
.
ResponseWriter
,
opts
*
Options
,
supportedStreamProtocols
[]
string
,
idleTimeout
,
streamCreationTimeout
time
.
Duration
)
(
*
context
,
bool
)
{
func
createH
TTP
StreamStreams
(
req
*
http
.
Request
,
w
http
.
ResponseWriter
,
opts
*
Options
,
supportedStreamProtocols
[]
string
,
idleTimeout
,
streamCreationTimeout
time
.
Duration
)
(
*
context
,
bool
)
{
protocol
,
err
:=
httpstream
.
Handshake
(
req
,
w
,
supportedStreamProtocols
)
protocol
,
err
:=
httpstream
.
Handshake
(
req
,
w
,
supportedStreamProtocols
)
if
err
!=
nil
{
if
err
!=
nil
{
http
.
Error
(
w
,
err
.
Error
(),
http
.
StatusBadRequest
)
http
.
Error
(
w
,
err
.
Error
(),
http
.
StatusBadRequest
)
...
...
pkg/kubelet/util/queue/work_queue.go
View file @
d61e8785
...
@@ -41,6 +41,7 @@ type basicWorkQueue struct {
...
@@ -41,6 +41,7 @@ type basicWorkQueue struct {
var
_
WorkQueue
=
&
basicWorkQueue
{}
var
_
WorkQueue
=
&
basicWorkQueue
{}
// NewBasicWorkQueue returns a new basic WorkQueue with the provided clock
func
NewBasicWorkQueue
(
clock
clock
.
Clock
)
WorkQueue
{
func
NewBasicWorkQueue
(
clock
clock
.
Clock
)
WorkQueue
{
queue
:=
make
(
map
[
types
.
UID
]
time
.
Time
)
queue
:=
make
(
map
[
types
.
UID
]
time
.
Time
)
return
&
basicWorkQueue
{
queue
:
queue
,
clock
:
clock
}
return
&
basicWorkQueue
{
queue
:
queue
,
clock
:
clock
}
...
...
pkg/kubelet/util/sliceutils/sliceutils.go
View file @
d61e8785
...
@@ -21,6 +21,7 @@ import (
...
@@ -21,6 +21,7 @@ import (
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
kubecontainer
"k8s.io/kubernetes/pkg/kubelet/container"
)
)
// StringInSlice returns true if s is in list
func
StringInSlice
(
s
string
,
list
[]
string
)
bool
{
func
StringInSlice
(
s
string
,
list
[]
string
)
bool
{
for
_
,
v
:=
range
list
{
for
_
,
v
:=
range
list
{
if
v
==
s
{
if
v
==
s
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment