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
9c74dc4e
Unverified
Commit
9c74dc4e
authored
Nov 29, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 29, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70834 from zhangmingld/gloginfoinsteadinfof
use glog.info instead glog.infof when no var
parents
550f6200
fb73574d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
server.go
cmd/kubelet/app/server.go
+3
-3
No files found.
cmd/kubelet/app/server.go
View file @
9c74dc4e
...
@@ -663,7 +663,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
...
@@ -663,7 +663,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
if
kubeDeps
.
ContainerManager
==
nil
{
if
kubeDeps
.
ContainerManager
==
nil
{
if
s
.
CgroupsPerQOS
&&
s
.
CgroupRoot
==
""
{
if
s
.
CgroupsPerQOS
&&
s
.
CgroupRoot
==
""
{
klog
.
Info
f
(
"--cgroups-per-qos enabled, but --cgroup-root was not specified. defaulting to /"
)
klog
.
Info
(
"--cgroups-per-qos enabled, but --cgroup-root was not specified. defaulting to /"
)
s
.
CgroupRoot
=
"/"
s
.
CgroupRoot
=
"/"
}
}
kubeReserved
,
err
:=
parseResourceList
(
s
.
KubeReserved
)
kubeReserved
,
err
:=
parseResourceList
(
s
.
KubeReserved
)
...
@@ -993,10 +993,10 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
...
@@ -993,10 +993,10 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
if
_
,
err
:=
k
.
RunOnce
(
podCfg
.
Updates
());
err
!=
nil
{
if
_
,
err
:=
k
.
RunOnce
(
podCfg
.
Updates
());
err
!=
nil
{
return
fmt
.
Errorf
(
"runonce failed: %v"
,
err
)
return
fmt
.
Errorf
(
"runonce failed: %v"
,
err
)
}
}
klog
.
Info
f
(
"Started kubelet as runonce"
)
klog
.
Info
(
"Started kubelet as runonce"
)
}
else
{
}
else
{
startKubelet
(
k
,
podCfg
,
&
kubeServer
.
KubeletConfiguration
,
kubeDeps
,
kubeServer
.
EnableServer
)
startKubelet
(
k
,
podCfg
,
&
kubeServer
.
KubeletConfiguration
,
kubeDeps
,
kubeServer
.
EnableServer
)
klog
.
Info
f
(
"Started kubelet"
)
klog
.
Info
(
"Started kubelet"
)
}
}
return
nil
return
nil
}
}
...
...
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