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
3a23c678
Commit
3a23c678
authored
Jan 29, 2018
by
Brendan Burns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove setInitError.
parent
18758f50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
kubelet.go
pkg/kubelet/kubelet.go
+1
-2
runtime.go
pkg/kubelet/runtime.go
+0
-10
No files found.
pkg/kubelet/kubelet.go
View file @
3a23c678
...
@@ -1334,8 +1334,7 @@ func (kl *Kubelet) Run(updates <-chan kubetypes.PodUpdate) {
...
@@ -1334,8 +1334,7 @@ func (kl *Kubelet) Run(updates <-chan kubetypes.PodUpdate) {
if
err
:=
kl
.
initializeModules
();
err
!=
nil
{
if
err
:=
kl
.
initializeModules
();
err
!=
nil
{
kl
.
recorder
.
Eventf
(
kl
.
nodeRef
,
v1
.
EventTypeWarning
,
events
.
KubeletSetupFailed
,
err
.
Error
())
kl
.
recorder
.
Eventf
(
kl
.
nodeRef
,
v1
.
EventTypeWarning
,
events
.
KubeletSetupFailed
,
err
.
Error
())
glog
.
Error
(
err
)
glog
.
Fatal
(
err
)
kl
.
runtimeState
.
setInitError
(
err
)
}
}
// Start volume manager
// Start volume manager
...
...
pkg/kubelet/runtime.go
View file @
3a23c678
...
@@ -29,7 +29,6 @@ type runtimeState struct {
...
@@ -29,7 +29,6 @@ type runtimeState struct {
networkError
error
networkError
error
internalError
error
internalError
error
cidr
string
cidr
string
initError
error
healthChecks
[]
*
healthCheck
healthChecks
[]
*
healthCheck
}
}
...
@@ -78,19 +77,10 @@ func (s *runtimeState) podCIDR() string {
...
@@ -78,19 +77,10 @@ func (s *runtimeState) podCIDR() string {
return
s
.
cidr
return
s
.
cidr
}
}
func
(
s
*
runtimeState
)
setInitError
(
err
error
)
{
s
.
Lock
()
defer
s
.
Unlock
()
s
.
initError
=
err
}
func
(
s
*
runtimeState
)
runtimeErrors
()
[]
string
{
func
(
s
*
runtimeState
)
runtimeErrors
()
[]
string
{
s
.
RLock
()
s
.
RLock
()
defer
s
.
RUnlock
()
defer
s
.
RUnlock
()
var
ret
[]
string
var
ret
[]
string
if
s
.
initError
!=
nil
{
ret
=
append
(
ret
,
s
.
initError
.
Error
())
}
if
!
s
.
lastBaseRuntimeSync
.
Add
(
s
.
baseRuntimeSyncThreshold
)
.
After
(
time
.
Now
())
{
if
!
s
.
lastBaseRuntimeSync
.
Add
(
s
.
baseRuntimeSyncThreshold
)
.
After
(
time
.
Now
())
{
ret
=
append
(
ret
,
"container runtime is down"
)
ret
=
append
(
ret
,
"container runtime is down"
)
}
}
...
...
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