From 7a737892f5e1e96549129aea4d4d96565f9bcb7a Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Thu, 30 Apr 2015 17:01:29 -0700 Subject: [PATCH] Extract out interface for GetPods(). This will remove the circular import with dockertools for DockerManager. Eventually, this will be Runtime. --- pkg/kubelet/lifecycle/handlers.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/lifecycle/handlers.go b/pkg/kubelet/lifecycle/handlers.go index 123bca0aa50..1131350da0b 100644 --- a/pkg/kubelet/lifecycle/handlers.go +++ b/pkg/kubelet/lifecycle/handlers.go @@ -23,7 +23,6 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober" kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" @@ -33,11 +32,15 @@ import ( type HandlerRunner struct { httpGetter kubeletTypes.HttpGetter commandRunner prober.ContainerCommandRunner - containerManager *dockertools.DockerManager + containerManager podStatusProvider +} + +type podStatusProvider interface { + GetPodStatus(pod *api.Pod) (*api.PodStatus, error) } // TODO(yifan): Merge commandRunner and containerManager once containerManager implements the ContainerCommandRunner interface. -func NewHandlerRunner(httpGetter kubeletTypes.HttpGetter, commandRunner prober.ContainerCommandRunner, containerManager *dockertools.DockerManager) kubecontainer.HandlerRunner { +func NewHandlerRunner(httpGetter kubeletTypes.HttpGetter, commandRunner prober.ContainerCommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner { return &HandlerRunner{ httpGetter: httpGetter, commandRunner: commandRunner,