diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index a90f7fb99a..76ed5abc21 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -64,7 +64,7 @@ func startComponents(manifestURL string) (apiServerURL string) { SyncFrequency: 5 * time.Second, HTTPCheckFrequency: 5 * time.Second, } - go myKubelet.RunKubelet("", manifestURL, servers[0], "localhost", "", 0) + go myKubelet.RunKubelet("", "", manifestURL, servers[0], "localhost", 10250) // Create a second kubelet so that the guestbook example's two redis slaves both // have a place they can schedule. @@ -76,7 +76,7 @@ func startComponents(manifestURL string) (apiServerURL string) { SyncFrequency: 5 * time.Second, HTTPCheckFrequency: 5 * time.Second, } - go otherKubelet.RunKubelet("", "", servers[0], "localhost", "", 0) + go otherKubelet.RunKubelet("", "", "", servers[0], "localhost", 10251) return apiserver.URL } diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 55e880a3d3..865ea19ef1 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -89,5 +89,5 @@ func main() { SyncFrequency: *syncFrequency, HTTPCheckFrequency: *httpCheckFrequency, } - my_kubelet.RunKubelet(*config, *manifestUrl, *etcdServers, *address, *dockerEndpoint, *port) + my_kubelet.RunKubelet(*dockerEndpoint, *config, *manifestUrl, *etcdServers, *address, *port) } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index eac9c22524..a668d8f808 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -101,9 +101,9 @@ const ( // Starts background goroutines. If config_path, manifest_url, or address are empty, // they are not watched. Never returns. -func (kl *Kubelet) RunKubelet(config_path, manifest_url, etcd_servers, address, endpoint string, port uint) { +func (kl *Kubelet) RunKubelet(dockerEndpoint, config_path, manifest_url, etcd_servers, address string, port uint) { if kl.DockerPuller == nil { - kl.DockerPuller = MakeDockerPuller(endpoint) + kl.DockerPuller = MakeDockerPuller(dockerEndpoint) } updateChannel := make(chan manifestUpdate) if config_path != "" {