github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76690 from SataQiu/fix-golint-kubelet-20190417

Browse Source 
Fix some golint failures of pkg/kubelet
This commit is contained in:
Kubernetes Prow Robot 2019-04-24 12:24:51 -07:00 committed by GitHub
commit 5c4a59f9af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/errors.go
View File

@ -19,9 +19,11 @@ package kubelet
import "errors" import "errors"
const ( const (
// NetworkNotReadyErrorMsg is used to describe the error that network is not ready
NetworkNotReadyErrorMsg = "network is not ready" NetworkNotReadyErrorMsg = "network is not ready"
) )
var ( var (
// ErrNetworkUnknown indicates the network state is unknown
ErrNetworkUnknown = errors.New("network state unknown") ErrNetworkUnknown = errors.New("network state unknown")
) )

6
pkg/kubelet/runtime.go
View File

@ -85,13 +85,13 @@ func (s *runtimeState) runtimeErrors() error {
defer s.RUnlock() defer s.RUnlock()
errs := []error{} errs := []error{}
if s.lastBaseRuntimeSync.IsZero() { if s.lastBaseRuntimeSync.IsZero() {
errs = append(errs, errors.New("container runtime status check may not have completed yet.")) errs = append(errs, errors.New("container runtime status check may not have completed yet"))
} else if !s.lastBaseRuntimeSync.Add(s.baseRuntimeSyncThreshold).After(time.Now()) { } else if !s.lastBaseRuntimeSync.Add(s.baseRuntimeSyncThreshold).After(time.Now()) {
errs = append(errs, errors.New("container runtime is down.")) errs = append(errs, errors.New("container runtime is down"))
} }
for _, hc := range s.healthChecks { for _, hc := range s.healthChecks {
if ok, err := hc.fn(); !ok { if ok, err := hc.fn(); !ok {
errs = append(errs, fmt.Errorf("%s is not healthy: %v.", hc.name, err)) errs = append(errs, fmt.Errorf("%s is not healthy: %v", hc.name, err))
} }
} }