From 4db51270736e4c2cd7c1aa9623ec334dd60ffcbb Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Wed, 29 Apr 2015 17:50:59 -0700
Subject: [PATCH] Make HttpGetter a shared Kubelet type.

---
 pkg/kubelet/handlers.go                   | 5 +++--
 pkg/kubelet/kubelet.go                    | 6 +-----
 pkg/kubelet/types/{docker.go => types.go} | 6 ++++++
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename pkg/kubelet/types/{docker.go => types.go} (88%)

diff --git a/pkg/kubelet/handlers.go b/pkg/kubelet/handlers.go
index 54e5bf6e940..04abdb6c378 100644
--- a/pkg/kubelet/handlers.go
+++ b/pkg/kubelet/handlers.go
@@ -25,18 +25,19 @@ import (
 	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"
 	"github.com/golang/glog"
 )
 
 type handlerRunner struct {
-	httpGetter       httpGetter
+	httpGetter       kubeletTypes.HttpGetter
 	commandRunner    prober.ContainerCommandRunner
 	containerManager *dockertools.DockerManager
 }
 
 // TODO(yifan): Merge commandRunner and containerManager once containerManager implements the ContainerCommandRunner interface.
-func newHandlerRunner(httpGetter httpGetter, commandRunner prober.ContainerCommandRunner, containerManager *dockertools.DockerManager) kubecontainer.HandlerRunner {
+func newHandlerRunner(httpGetter kubeletTypes.HttpGetter, commandRunner prober.ContainerCommandRunner, containerManager *dockertools.DockerManager) kubecontainer.HandlerRunner {
 	return &handlerRunner{
 		httpGetter:       httpGetter,
 		commandRunner:    commandRunner,
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index a0d2ca07536..54508fec227 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -291,10 +291,6 @@ func NewMainKubelet(
 	return klet, nil
 }
 
-type httpGetter interface {
-	Get(url string) (*http.Response, error)
-}
-
 type serviceLister interface {
 	List() (api.ServiceList, error)
 }
@@ -326,7 +322,7 @@ type Kubelet struct {
 	// Optional, defaults to simple Docker implementation
 	runner prober.ContainerCommandRunner
 	// Optional, client for http requests, defaults to empty client
-	httpClient httpGetter
+	httpClient kubeletTypes.HttpGetter
 
 	// cAdvisor used for container information.
 	cadvisor cadvisor.Interface
diff --git a/pkg/kubelet/types/docker.go b/pkg/kubelet/types/types.go
similarity index 88%
rename from pkg/kubelet/types/docker.go
rename to pkg/kubelet/types/types.go
index 475046b5eaa..d719885a912 100644
--- a/pkg/kubelet/types/docker.go
+++ b/pkg/kubelet/types/types.go
@@ -16,5 +16,11 @@ limitations under the License.
 
 package types
 
+import "net/http"
+
 // DockerID is an ID of docker container. It is a type to make it clear when we're working with docker container Ids
 type DockerID string
+
+type HttpGetter interface {
+	Get(url string) (*http.Response, error)
+}