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
b0a05b45
Commit
b0a05b45
authored
Apr 14, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Apr 14, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #42474 from k82cn/rm_empty_line_kl
Automatic merge from submit-queue Removed un-necessary empty line.
parents
03e555f0
41c4426a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
3 deletions
+0
-3
server.go
cmd/kubelet/app/server.go
+0
-2
kubelet_node_status.go
pkg/kubelet/kubelet_node_status.go
+0
-1
No files found.
cmd/kubelet/app/server.go
View file @
b0a05b45
...
...
@@ -128,7 +128,6 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API
// UnsecuredKubeletDeps returns a KubeletDeps suitable for being run, or an error if the server setup
// is not valid. It will not start any background processes, and does not include authentication/authorization
func
UnsecuredKubeletDeps
(
s
*
options
.
KubeletServer
)
(
*
kubelet
.
KubeletDeps
,
error
)
{
// Initialize the TLS Options
tlsOptions
,
err
:=
InitializeTLS
(
&
s
.
KubeletFlags
,
&
s
.
KubeletConfiguration
)
if
err
!=
nil
{
...
...
@@ -353,7 +352,6 @@ func makeEventRecorder(s *componentconfig.KubeletConfiguration, kubeDeps *kubele
}
else
{
glog
.
Warning
(
"No api server defined - no events will be sent to API server."
)
}
}
func
run
(
s
*
options
.
KubeletServer
,
kubeDeps
*
kubelet
.
KubeletDeps
)
(
err
error
)
{
...
...
pkg/kubelet/kubelet_node_status.go
View file @
b0a05b45
...
...
@@ -209,7 +209,6 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
}
}
node
.
Spec
.
Taints
=
taints
}
// Initially, set NodeNetworkUnavailable to true.
if
kl
.
providerRequiresNetworkingConfiguration
()
{
...
...
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