Merge pull request #13186 from wojtek-t/reenable_cacher_2

Reenable watch in apiserver
pull/6/head
Filip Grzadkowski 2015-08-26 11:10:22 +02:00
commit dee21c89cd
1 changed files with 4 additions and 3 deletions

View File

@ -429,9 +429,10 @@ func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter)
// init initializes master.
func (m *Master) init(c *Config) {
enableCacher := true
healthzChecks := []healthz.HealthzChecker{}
m.clock = util.RealClock{}
podStorage := podetcd.NewStorage(c.DatabaseStorage, false, c.KubeletClient)
podStorage := podetcd.NewStorage(c.DatabaseStorage, enableCacher, c.KubeletClient)
podTemplateStorage := podtemplateetcd.NewREST(c.DatabaseStorage)
@ -447,10 +448,10 @@ func (m *Master) init(c *Config) {
namespaceStorage, namespaceStatusStorage, namespaceFinalizeStorage := namespaceetcd.NewREST(c.DatabaseStorage)
m.namespaceRegistry = namespace.NewRegistry(namespaceStorage)
endpointsStorage := endpointsetcd.NewREST(c.DatabaseStorage, false)
endpointsStorage := endpointsetcd.NewREST(c.DatabaseStorage, enableCacher)
m.endpointRegistry = endpoint.NewRegistry(endpointsStorage)
nodeStorage, nodeStatusStorage := nodeetcd.NewREST(c.DatabaseStorage, false, c.KubeletClient)
nodeStorage, nodeStatusStorage := nodeetcd.NewREST(c.DatabaseStorage, enableCacher, c.KubeletClient)
m.nodeRegistry = minion.NewRegistry(nodeStorage)
serviceStorage := serviceetcd.NewREST(c.DatabaseStorage)