Remove pods from pkg/registry/etcd/etcd.go since they are in their ow…

…n type Altered the master initialization code
satnam6502 · Feb 16, 2015 · 7a93af5 · 7a93af5
1 parent 247e467
commit 7a93af5
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 1,067 deletions.
diff --git a/pkg/master/master.go b/pkg/master/master.go
@@ -117,19 +117,9 @@ type Config struct {
 // Master contains state for a Kubernetes cluster master/api server.
 type Master struct {
 	// "Inputs", Copied from Config
-	controllerRegistry    controller.Registry
-	serviceRegistry       service.Registry
-	endpointRegistry      endpoint.Registry
-	minionRegistry        minion.Registry
-	eventRegistry         generic.Registry
-	limitRangeRegistry    generic.Registry
-	resourceQuotaRegistry resourcequota.Registry
-	namespaceRegistry     generic.Registry
-	boundPodFactory       pod.BoundPodFactory
-	storage               map[string]apiserver.RESTStorage
-	client                *client.Client
-	portalNet             *net.IPNet
-	cacheTimeout          time.Duration
+	client       *client.Client
+	portalNet    *net.IPNet
+	cacheTimeout time.Duration
 
 	mux                   apiserver.Mux
 	muxHelper             *apiserver.MuxHelper
@@ -156,6 +146,17 @@ type Master struct {
 	serviceReadWritePort int
 	masterServices       *util.Runner
 
+	// storage contains the RESTful endpoints exposed by this master
+	storage map[string]apiserver.RESTStorage
+
+	// registries are internal client APIs for accessing the storage layer
+	// TODO: define the internal typed interface in a way that clients can
+	// also be replaced
+	nodeRegistry      minion.Registry
+	namespaceRegistry generic.Registry
+	serviceRegistry   service.Registry
+	endpointRegistry  endpoint.Registry
+
 	// "Outputs"
 	Handler         http.Handler
 	InsecureHandler http.Handler
@@ -259,7 +260,6 @@ func setDefaults(c *Config) {
 //   any unhandled paths to "Handler".
 func New(c *Config) *Master {
 	setDefaults(c)
-	boundPodFactory := &pod.BasicBoundPodFactory{}
 	if c.KubeletClient == nil {
 		glog.Fatalf("master.New() called with config.KubeletClient == nil")
 	}
@@ -276,15 +276,6 @@ func New(c *Config) *Master {
 	glog.Infof("Setting master service IPs based on PortalNet subnet to %q (read-only) and %q (read-write).", serviceReadOnlyIP, serviceReadWriteIP)
 
 	m := &Master{
-		controllerRegistry:    etcd.NewRegistry(c.EtcdHelper, nil),
-		serviceRegistry:       etcd.NewRegistry(c.EtcdHelper, nil),
-		endpointRegistry:      etcd.NewRegistry(c.EtcdHelper, nil),
-		eventRegistry:         event.NewEtcdRegistry(c.EtcdHelper, uint64(c.EventTTL.Seconds())),
-		namespaceRegistry:     namespace.NewEtcdRegistry(c.EtcdHelper),
-		minionRegistry:        etcd.NewRegistry(c.EtcdHelper, nil),
-		limitRangeRegistry:    limitrange.NewEtcdRegistry(c.EtcdHelper),
-		resourceQuotaRegistry: resourcequota.NewEtcdRegistry(c.EtcdHelper),
-		boundPodFactory:       boundPodFactory,
 		client:                c.Client,
 		portalNet:             c.PortalNet,
 		rootWebService:        new(restful.WebService),
@@ -374,13 +365,28 @@ func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter)
 // init initializes master.
 func (m *Master) init(c *Config) {
 
-	podStorage, bindingStorage := podetcd.NewREST(c.EtcdHelper, m.boundPodFactory)
+	boundPodFactory := &pod.BasicBoundPodFactory{}
+	podStorage, bindingStorage := podetcd.NewREST(c.EtcdHelper, boundPodFactory)
 	podRegistry := pod.NewRegistry(podStorage)
 
-	nodeRESTStorage := minion.NewREST(m.minionRegistry)
+	eventRegistry := event.NewEtcdRegistry(c.EtcdHelper, uint64(c.EventTTL.Seconds()))
+	limitRangeRegistry := limitrange.NewEtcdRegistry(c.EtcdHelper)
+	resourceQuotaRegistry := resourcequota.NewEtcdRegistry(c.EtcdHelper)
+	m.namespaceRegistry = namespace.NewEtcdRegistry(c.EtcdHelper)
+
+	// TODO: split me up into distinct storage registries
+	registry := etcd.NewRegistry(c.EtcdHelper, podRegistry)
+
+	m.serviceRegistry = registry
+	m.endpointRegistry = registry
+	m.nodeRegistry = registry
+
+	nodeStorage := minion.NewREST(m.nodeRegistry)
+	// TODO: unify the storage -> registry and storage -> client patterns
+	nodeStorageClient := RESTStorageToNodes(nodeStorage)
 	podCache := NewPodCache(
 		c.KubeletClient,
-		RESTStorageToNodes(nodeRESTStorage).Nodes(),
+		nodeStorageClient.Nodes(),
 		podRegistry,
 	)
 	go util.Forever(func() { podCache.UpdateAllContainers() }, m.cacheTimeout)
@@ -394,16 +400,16 @@ func (m *Master) init(c *Config) {
 		"pods":     podStorage,
 		"bindings": bindingStorage,
 
-		"replicationControllers": controller.NewREST(m.controllerRegistry, podRegistry),
-		"services":               service.NewREST(m.serviceRegistry, c.Cloud, m.minionRegistry, m.portalNet),
+		"replicationControllers": controller.NewREST(registry, podRegistry),
+		"services":               service.NewREST(m.serviceRegistry, c.Cloud, m.nodeRegistry, m.portalNet),
 		"endpoints":              endpoint.NewREST(m.endpointRegistry),
-		"minions":                nodeRESTStorage,
-		"nodes":                  nodeRESTStorage,
-		"events":                 event.NewREST(m.eventRegistry),
+		"minions":                nodeStorage,
+		"nodes":                  nodeStorage,
+		"events":                 event.NewREST(eventRegistry),
 
-		"limitRanges":         limitrange.NewREST(m.limitRangeRegistry),
-		"resourceQuotas":      resourcequota.NewREST(m.resourceQuotaRegistry),
-		"resourceQuotaUsages": resourcequotausage.NewREST(m.resourceQuotaRegistry),
+		"limitRanges":         limitrange.NewREST(limitRangeRegistry),
+		"resourceQuotas":      resourcequota.NewREST(resourceQuotaRegistry),
+		"resourceQuotaUsages": resourcequotausage.NewREST(resourceQuotaRegistry),
 		"namespaces":          namespace.NewREST(m.namespaceRegistry),
 	}
 
@@ -542,7 +548,7 @@ func (m *Master) getServersToValidate(c *Config) map[string]apiserver.Server {
 		}
 		serversToValidate[fmt.Sprintf("etcd-%d", ix)] = apiserver.Server{Addr: addr, Port: port, Path: "/v2/keys/"}
 	}
-	nodes, err := m.minionRegistry.ListMinions(api.NewDefaultContext())
+	nodes, err := m.nodeRegistry.ListMinions(api.NewDefaultContext())
 	if err != nil {
 		glog.Errorf("Failed to list minions: %v", err)
 	}

diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go
@@ -32,7 +32,7 @@ func TestGetServersToValidate(t *testing.T) {
 	fakeClient.Machines = []string{"http://machine1:4001", "http://machine2", "http://machine3:4003"}
 	config.EtcdHelper = tools.EtcdHelper{fakeClient, latest.Codec, nil}
 
-	master.minionRegistry = registrytest.NewMinionRegistry([]string{"node1", "node2"}, api.NodeResources{})
+	master.nodeRegistry = registrytest.NewMinionRegistry([]string{"node1", "node2"}, api.NodeResources{})
 
 	servers := master.getServersToValidate(&config)