Merge pull request kubernetes#4810 from fgrzadkowski/disable_pod_stat…

…us_probes Add flag to control probing pods statuses from kubelets.
satnam6502 · Mar 2, 2015 · 445fd56 · 445fd56
2 parents fdd0b52 + 86b1c90
commit 445fd56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -183,6 +183,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
 		ReadOnlyPort:      portNumber,
 		PublicAddress:     publicAddress,
 		CacheTimeout:      2 * time.Second,
+		SyncPodStatus:     true,
 	})
 	handler.delegate = m.Handler
 

diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -73,6 +73,7 @@ type APIServer struct {
 	RuntimeConfig              util.ConfigurationMap
 	KubeletConfig              client.KubeletConfig
 	ClusterName                string
+	SyncPodStatus              bool
 }
 
 // NewAPIServer creates a new APIServer object with default parameters
@@ -92,6 +93,7 @@ func NewAPIServer() *APIServer {
 		EnableLogsSupport:      true,
 		MasterServiceNamespace: api.NamespaceDefault,
 		ClusterName:            "kubernetes",
+		SyncPodStatus:          true,
 
 		RuntimeConfig: make(util.ConfigurationMap),
 		KubeletConfig: client.KubeletConfig{
@@ -146,6 +148,7 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&s.AllowPrivileged, "allow_privileged", s.AllowPrivileged, "If true, allow privileged containers.")
 	fs.Var(&s.PortalNet, "portal_net", "A CIDR notation IP range from which to assign portal IPs. This must not overlap with any IP ranges assigned to nodes for pods.")
 	fs.StringVar(&s.MasterServiceNamespace, "master_service_namespace", s.MasterServiceNamespace, "The namespace from which the kubernetes master services should be injected into pods")
+	fs.BoolVar(&s.SyncPodStatus, "sync_pod_status", s.SyncPodStatus, "If true, periodically fetch pods statuses from kubelets.")
 	fs.Var(&s.RuntimeConfig, "runtime_config", "A set of key=value pairs that describe runtime configuration that may be passed to the apiserver.")
 	client.BindKubeletClientConfigFlags(fs, &s.KubeletConfig)
 	fs.StringVar(&s.ClusterName, "cluster_name", s.ClusterName, "The instance prefix for the cluster")
@@ -245,6 +248,7 @@ func (s *APIServer) Run(_ []string) error {
 		EnableV1Beta3:          v1beta3,
 		MasterServiceNamespace: s.MasterServiceNamespace,
 		ClusterName:            s.ClusterName,
+		SyncPodStatus:          s.SyncPodStatus,
 	}
 	m := master.New(config)
 

diff --git a/pkg/master/master.go b/pkg/master/master.go
@@ -115,6 +115,9 @@ type Config struct {
 
 	// The name of the cluster.
 	ClusterName string
+
+	// If true we will periodically probe pods statuses.
+	SyncPodStatus bool
 }
 
 // Master contains state for a Kubernetes cluster master/api server.
@@ -393,7 +396,9 @@ func (m *Master) init(c *Config) {
 		nodeStorageClient.Nodes(),
 		podRegistry,
 	)
-	go util.Forever(func() { podCache.UpdateAllContainers() }, m.cacheTimeout)
+	if c.SyncPodStatus {
+		go util.Forever(func() { podCache.UpdateAllContainers() }, m.cacheTimeout)
+	}
 	go util.Forever(func() { podCache.GarbageCollectPodStatus() }, time.Minute*30)
 
 	// TODO: refactor podCache to sit on top of podStorage via status calls