Extract non-storage operations from service etcd

This commit is contained in:
Wojciech Tyczynski
2015-08-06 10:46:45 +02:00
parent e034712456
commit d11ab96446
5 changed files with 28 additions and 84 deletions

View File

@@ -448,10 +448,7 @@ func (m *Master) init(c *Config) {
nodeStorage, nodeStatusStorage := nodeetcd.NewStorage(c.DatabaseStorage, c.KubeletClient)
m.nodeRegistry = minion.NewRegistry(nodeStorage)
// TODO: split me up into distinct storage registries
registry := etcd.NewRegistry(c.DatabaseStorage, m.endpointRegistry)
m.serviceRegistry = registry
m.serviceRegistry = etcd.NewRegistry(c.DatabaseStorage)
var serviceClusterIPRegistry service.RangeRegistry
serviceClusterIPAllocator := ipallocator.NewAllocatorCIDRRange(m.serviceClusterIPRange, func(max int, rangeSpec string) allocator.Interface {