scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-01 05:43:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move GetHostName and GetDockerEndpoint methods to pkg/util

Browse Source
This commit is contained in:
Dawn Chen
2015-01-05 11:44:21 -08:00
parent 83f1aa5546
commit f718957a79
5 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubernetes/kubernetes.go
View File

@@ -27,7 +27,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
"github.com/GoogleCloudPlatform/kubernetes/pkg/standalone"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -52,7 +51,7 @@ func startComponents(etcdClient tools.EtcdClient, cl *client.Client, addr string
standalone.RunScheduler(cl)
standalone.RunControllerManager(machineList, cl, *nodeMilliCPU, *nodeMemory)
dockerClient := kubelet.ConnectToDockerOrDie(*dockerEndpoint)
dockerClient := util.ConnectToDockerOrDie(*dockerEndpoint)
standalone.SimpleRunKubelet(etcdClient, dockerClient, machineList[0], "/tmp/kubernetes", "", "127.0.0.1", 10250)
}