From 3a23c678c547bd63d62a7829a4cf33128d27493c Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 29 Jan 2018 21:44:54 -0800 Subject: [PATCH] Remove setInitError. --- pkg/kubelet/kubelet.go | 3 +-- pkg/kubelet/runtime.go | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index eb335301f31..1c642bb845b 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1334,8 +1334,7 @@ func (kl *Kubelet) Run(updates <-chan kubetypes.PodUpdate) { if err := kl.initializeModules(); err != nil { kl.recorder.Eventf(kl.nodeRef, v1.EventTypeWarning, events.KubeletSetupFailed, err.Error()) - glog.Error(err) - kl.runtimeState.setInitError(err) + glog.Fatal(err) } // Start volume manager diff --git a/pkg/kubelet/runtime.go b/pkg/kubelet/runtime.go index 445b4cf4ebb..18883cb7ff9 100644 --- a/pkg/kubelet/runtime.go +++ b/pkg/kubelet/runtime.go @@ -29,7 +29,6 @@ type runtimeState struct { networkError error internalError error cidr string - initError error healthChecks []*healthCheck } @@ -78,19 +77,10 @@ func (s *runtimeState) podCIDR() string { return s.cidr } -func (s *runtimeState) setInitError(err error) { - s.Lock() - defer s.Unlock() - s.initError = err -} - func (s *runtimeState) runtimeErrors() []string { s.RLock() defer s.RUnlock() var ret []string - if s.initError != nil { - ret = append(ret, s.initError.Error()) - } if !s.lastBaseRuntimeSync.Add(s.baseRuntimeSyncThreshold).After(time.Now()) { ret = append(ret, "container runtime is down") }