Make HttpGetter a shared Kubelet type.

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,

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

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)
+}