From 2201554b3f190c1b7b4e8ca66cb2cc355a5befbd Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Mon, 25 Apr 2016 17:32:16 -0700 Subject: [PATCH] Disable cAdvisor event storage by default --- pkg/kubelet/cadvisor/cadvisor_linux.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index f7691b63846..9c2a22de8c5 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -52,10 +52,21 @@ const defaultHousekeepingInterval = 10 * time.Second const allowDynamicHousekeeping = true func init() { - // Override the default cAdvisor housekeeping interval. - if f := flag.Lookup("housekeeping_interval"); f != nil { - f.DefValue = defaultHousekeepingInterval.String() - f.Value.Set(f.DefValue) + // Override cAdvisor flag defaults. + flagOverrides := map[string]string{ + // Override the default cAdvisor housekeeping interval. + "housekeeping_interval": defaultHousekeepingInterval.String(), + // Disable event storage by default. + "event_storage_event_limit": "default=0", + "event_storage_age_limit": "default=0", + } + for name, defaultValue := range flagOverrides { + if f := flag.Lookup(name); f != nil { + f.DefValue = defaultValue + f.Value.Set(defaultValue) + } else { + glog.Errorf("Expected cAdvisor flag %q not found", name) + } } }