Skip to content

Commit dee21c8

Browse files
committed
Merge pull request kubernetes#13186 from wojtek-t/reenable_cacher_2
Reenable watch in apiserver
2 parents 9f1d2af + c0aba1d commit dee21c8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pkg/master/master.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,10 @@ func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter)
429429

430430
// init initializes master.
431431
func (m *Master) init(c *Config) {
432+
enableCacher := true
432433
healthzChecks := []healthz.HealthzChecker{}
433434
m.clock = util.RealClock{}
434-
podStorage := podetcd.NewStorage(c.DatabaseStorage, false, c.KubeletClient)
435+
podStorage := podetcd.NewStorage(c.DatabaseStorage, enableCacher, c.KubeletClient)
435436

436437
podTemplateStorage := podtemplateetcd.NewREST(c.DatabaseStorage)
437438

@@ -447,10 +448,10 @@ func (m *Master) init(c *Config) {
447448
namespaceStorage, namespaceStatusStorage, namespaceFinalizeStorage := namespaceetcd.NewREST(c.DatabaseStorage)
448449
m.namespaceRegistry = namespace.NewRegistry(namespaceStorage)
449450

450-
endpointsStorage := endpointsetcd.NewREST(c.DatabaseStorage, false)
451+
endpointsStorage := endpointsetcd.NewREST(c.DatabaseStorage, enableCacher)
451452
m.endpointRegistry = endpoint.NewRegistry(endpointsStorage)
452453

453-
nodeStorage, nodeStatusStorage := nodeetcd.NewREST(c.DatabaseStorage, false, c.KubeletClient)
454+
nodeStorage, nodeStatusStorage := nodeetcd.NewREST(c.DatabaseStorage, enableCacher, c.KubeletClient)
454455
m.nodeRegistry = minion.NewRegistry(nodeStorage)
455456

456457
serviceStorage := serviceetcd.NewREST(c.DatabaseStorage)

0 commit comments

Comments
 (0)