github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13028 from wojtek-t/switch_off_cacher

Browse Source 
[Merge only in case of strange problems on Jenkins] Disable watch in apiserver because of problems
This commit is contained in:
Zach Loafman 2015-08-21 10:33:22 -07:00
commit 5f36c07111
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/master.go
View File

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