github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68602 from Pingan2017/internalerr

Browse Source 
remove internalError in runtimeStates , not set anywhere
This commit is contained in:
k8s-ci-robot 2018-09-28 15:47:06 -07:00 committed by GitHub
commit 165faaaddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/runtime.go
View File

@ -27,7 +27,6 @@ type runtimeState struct {
lastBaseRuntimeSync time.Time lastBaseRuntimeSync time.Time
baseRuntimeSyncThreshold time.Duration baseRuntimeSyncThreshold time.Duration
networkError error networkError error
internalError error
cidr string cidr string
healthChecks []*healthCheck healthChecks []*healthCheck
} }
@ -78,9 +77,6 @@ func (s *runtimeState) runtimeErrors() []string {
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")
} }
if s.internalError != nil {
ret = append(ret, s.internalError.Error())
}
for _, hc := range s.healthChecks { for _, hc := range s.healthChecks {
if ok, err := hc.fn(); !ok { if ok, err := hc.fn(); !ok {
ret = append(ret, fmt.Sprintf("%s is not healthy: %v", hc.name, err)) ret = append(ret, fmt.Sprintf("%s is not healthy: %v", hc.name, err))
@ -107,6 +103,5 @@ func newRuntimeState(
lastBaseRuntimeSync: time.Time{}, lastBaseRuntimeSync: time.Time{},
baseRuntimeSyncThreshold: runtimeSyncThreshold, baseRuntimeSyncThreshold: runtimeSyncThreshold,
networkError: fmt.Errorf("network state unknown"), networkError: fmt.Errorf("network state unknown"),
internalError: nil,
} }
} }