Merge pull request #37865 from yujuhong/decouple_lifecycle

Automatic merge from submit-queue

kubelet: remove the pleg health check from healthz

This prevents kubelet from being killed when docker hangs.

Also, kubelet will report node not ready if PLEG hangs (`docker ps` + `docker inspect`).
This commit is contained in:
Kubernetes Submit Queue
2017-01-12 19:10:14 -08:00
committed by GitHub
5 changed files with 30 additions and 36 deletions

View File

@@ -2026,11 +2026,6 @@ func (kl *Kubelet) LatestLoopEntryTime() time.Time {
return val.(time.Time)
}
// PLEGHealthCheck returns whether the PLEG is healthy.
func (kl *Kubelet) PLEGHealthCheck() (bool, error) {
return kl.pleg.Healthy()
}
// updateRuntimeUp calls the container runtime status callback, initializing
// the runtime dependent modules when the container runtime first comes up,
// and returns an error if the status check fails. If the status check is OK,