From 0fc5e68207dee957f3a15c45cde61f208433eddf Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 8 Oct 2014 22:34:40 -0700 Subject: [PATCH] runonce: isPodRunning returns no error --- pkg/kubelet/runonce.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index f48d806d546..cdb00a6edfd 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -94,11 +94,7 @@ func (kl *Kubelet) runPod(pod Pod) error { if err != nil { return fmt.Errorf("failed to get kubelet docker containers: %v", err) } - running, err := kl.isPodRunning(pod, dockerContainers) - if err != nil { - return fmt.Errorf("error checking pod status: %v", err) - } - if running { + if running := kl.isPodRunning(pod, dockerContainers); running { glog.Infof("pod %q containers running", pod.Name) return nil } @@ -118,12 +114,12 @@ func (kl *Kubelet) runPod(pod Pod) error { } // isPodRunning returns true if all containers of a manifest are running. -func (kl *Kubelet) isPodRunning(pod Pod, dockerContainers dockertools.DockerContainers) (bool, error) { +func (kl *Kubelet) isPodRunning(pod Pod, dockerContainers dockertools.DockerContainers) bool { for _, container := range pod.Manifest.Containers { if dockerContainer, found, _ := dockerContainers.FindPodContainer(GetPodFullName(&pod), pod.Manifest.UUID, container.Name); !found || dockerContainer.Status != "running" { glog.Infof("container %q not found (%v) or not running: %#v", container.Name, found, dockerContainer) - return false, nil + return false } } - return true, nil + return true }