From 29a5da231d2b9733cf9c373bd2160e3b81ad881e Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 17 Apr 2015 14:34:52 -0700 Subject: [PATCH] kubelet: Refactor shouldContainerBeRestarted(): Remove the function's dependency on kubelet. --- pkg/kubelet/kubelet.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index b5629b3ceff..b0db9ded808 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -982,7 +982,7 @@ func (kl *Kubelet) makePodDataDirs(pod *api.Pod) error { return nil } -func (kl *Kubelet) shouldContainerBeRestarted(container *api.Container, pod *api.Pod, podStatus *api.PodStatus) bool { +func shouldContainerBeRestarted(container *api.Container, pod *api.Pod, podStatus *api.PodStatus, readinessManager *kubecontainer.ReadinessManager) bool { podFullName := kubecontainer.GetPodFullName(pod) // Get all dead container status. @@ -996,7 +996,7 @@ func (kl *Kubelet) shouldContainerBeRestarted(container *api.Container, pod *api // Set dead containers to unready state. for _, c := range resultStatus { // TODO(yifan): Unify the format of container ID. (i.e. including docker:// as prefix). - kl.readinessManager.RemoveReadiness(strings.TrimPrefix(c.ContainerID, dockertools.DockerPrefix)) + readinessManager.RemoveReadiness(strings.TrimPrefix(c.ContainerID, dockertools.DockerPrefix)) } // Check RestartPolicy for dead container. @@ -1124,7 +1124,7 @@ func (kl *Kubelet) computePodContainerChanges(pod *api.Pod, runningPod kubeconta c := runningPod.FindContainerByName(container.Name) if c == nil { - if kl.shouldContainerBeRestarted(&container, pod, &podStatus) { + if shouldContainerBeRestarted(&container, pod, &podStatus, kl.readinessManager) { // If we are here it means that the container is dead and should be restarted, or never existed and should // be created. We may be inserting this ID again if the container has changed and it has // RestartPolicy::Always, but it's not a big deal.