github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Make the service reconciller use the API, not a PodRegistry

Browse Source
This commit is contained in:
Brendan Burns
2014-07-18 13:22:26 -07:00
parent fda69bcca2
commit c6255afe37
5 changed files with 105 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/apiserver/apiserver.go
View File

@@ -76,11 +76,13 @@ func main() {
Port: *minionPort,
}
client := client.New("http://localhost:8080", nil)
var m *master.Master
if len(etcdServerList) > 0 {
m = master.New(etcdServerList, machineList, podInfoGetter, cloud, *minionRegexp)
m = master.New(etcdServerList, machineList, podInfoGetter, cloud, *minionRegexp, client)
} else {
m = master.NewMemoryServer(machineList, podInfoGetter, cloud)
m = master.NewMemoryServer(machineList, podInfoGetter, cloud, client)
}
glog.Fatal(m.Run(net.JoinHostPort(*address, strconv.Itoa(int(*port))), *apiPrefix))