github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #273 from brendandburns/kubelet

Browse Source 
Make the docker endpoint a flag.
This commit is contained in:
Daniel Smith
2014-06-27 17:09:25 -07:00
parent a5c3889866 f8060c5b3d
commit b21facafb1
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@@ -71,7 +71,7 @@ func main() {
SyncFrequency: 5 * time.Second,
HTTPCheckFrequency: 5 * time.Second,
}
go myKubelet.RunKubelet("", manifestUrl, servers[0], "localhost", 0)
go myKubelet.RunKubelet("", manifestUrl, servers[0], "localhost", "", 0)
// Create a second kublet so that the guestbook example's two redis slaves both
// have a place they can schedule.
@@ -84,7 +84,7 @@ func main() {
SyncFrequency: 5 * time.Second,
HTTPCheckFrequency: 5 * time.Second,
}
go otherKubelet.RunKubelet("", "", servers[0], "localhost", 0)
go otherKubelet.RunKubelet("", "", servers[0], "localhost", "", 0)
// Ok. we're good to go.
glog.Infof("API Server started on %s", apiserver.URL)