Merge pull request #5714 from fgrzadkowski/update_status_on_change

Update pod status only when it changes.
kubernetes · Mar 24, 2015 · a2e2fea · a2e2fea
2 parents 0902ffd + 632ca50
commit a2e2fea
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 176 deletions.
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -224,15 +224,13 @@ func startComponents(firstManifestURL, secondManifestURL, apiVersion string) (st
 	configFilePath := makeTempDirOrDie("config", testRootDir)
 	glog.Infof("Using %s as root dir for kubelet #1", testRootDir)
 	kcfg := kubeletapp.SimpleKubelet(cl, &fakeDocker1, machineList[0], testRootDir, firstManifestURL, "127.0.0.1", 10250, api.NamespaceDefault, empty_dir.ProbeVolumePlugins(), nil, cadvisorInterface, configFilePath)
-	kcfg.PodStatusUpdateFrequency = 1 * time.Second
 	kubeletapp.RunKubelet(kcfg)
 	// Kubelet (machine)
 	// Create a second kubelet so that the guestbook example's two redis slaves both
 	// have a place they can schedule.
 	testRootDir = makeTempDirOrDie("kubelet_integ_2.", "")
 	glog.Infof("Using %s as root dir for kubelet #2", testRootDir)
 	kcfg = kubeletapp.SimpleKubelet(cl, &fakeDocker2, machineList[1], testRootDir, secondManifestURL, "127.0.0.1", 10251, api.NamespaceDefault, empty_dir.ProbeVolumePlugins(), nil, cadvisorInterface, "")
-	kcfg.PodStatusUpdateFrequency = 1 * time.Second
 	kubeletapp.RunKubelet(kcfg)
 	return apiServer.URL, configFilePath
 }

diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -52,7 +52,6 @@ type KubeletServer struct {
 	FileCheckFrequency             time.Duration
 	HTTPCheckFrequency             time.Duration
 	StatusUpdateFrequency          time.Duration
-	PodStatusUpdateFrequency       time.Duration
 	ManifestURL                    string
 	EnableServer                   bool
 	Address                        util.IP
@@ -86,14 +85,13 @@ type KubeletServer struct {
 // NewKubeletServer will create a new KubeletServer with default values.
 func NewKubeletServer() *KubeletServer {
 	return &KubeletServer{
-		SyncFrequency:            10 * time.Second,
-		FileCheckFrequency:       20 * time.Second,
-		HTTPCheckFrequency:       20 * time.Second,
-		StatusUpdateFrequency:    20 * time.Second,
-		PodStatusUpdateFrequency: 2 * time.Minute,
-		EnableServer:             true,
-		Address:                  util.IP(net.ParseIP("127.0.0.1")),
-		Port:                     ports.KubeletPort,
+		SyncFrequency:         10 * time.Second,
+		FileCheckFrequency:    20 * time.Second,
+		HTTPCheckFrequency:    20 * time.Second,
+		StatusUpdateFrequency: 20 * time.Second,
+		EnableServer:          true,
+		Address:               util.IP(net.ParseIP("127.0.0.1")),
+		Port:                  ports.KubeletPort,
 		PodInfraContainerImage:      kubelet.PodInfraContainerImage,
 		RootDirectory:               defaultRootDir,
 		RegistryBurst:               10,
@@ -115,7 +113,6 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.Config, "config", s.Config, "Path to the config file or directory of files")
 	fs.DurationVar(&s.SyncFrequency, "sync_frequency", s.SyncFrequency, "Max period between synchronizing running containers and config")
 	fs.DurationVar(&s.StatusUpdateFrequency, "status_update_frequency", s.StatusUpdateFrequency, "Duration between posting node status to master")
-	fs.DurationVar(&s.PodStatusUpdateFrequency, "pod_status_update_frequency", s.PodStatusUpdateFrequency, "Duration between posting pod status updates to the master")
 	fs.DurationVar(&s.FileCheckFrequency, "file_check_frequency", s.FileCheckFrequency, "Duration between checking config files for new data")
 	fs.DurationVar(&s.HTTPCheckFrequency, "http_check_frequency", s.HTTPCheckFrequency, "Duration between checking http for new data")
 	fs.StringVar(&s.ManifestURL, "manifest_url", s.ManifestURL, "URL for accessing the container manifest")
@@ -183,7 +180,6 @@ func (s *KubeletServer) Run(_ []string) error {
 		ConfigFile:                     s.Config,
 		ManifestURL:                    s.ManifestURL,
 		StatusUpdateFrequency:          s.StatusUpdateFrequency,
-		PodStatusUpdateFrequency:       s.PodStatusUpdateFrequency,
 		FileCheckFrequency:             s.FileCheckFrequency,
 		HTTPCheckFrequency:             s.HTTPCheckFrequency,
 		PodInfraContainerImage:         s.PodInfraContainerImage,
@@ -283,24 +279,23 @@ func SimpleKubelet(client *client.Client,
 		RootDirectory:          rootDir,
 		ManifestURL:            manifestURL,
 		PodInfraContainerImage: kubelet.PodInfraContainerImage,
-		Port:                     port,
-		Address:                  util.IP(net.ParseIP(address)),
-		EnableServer:             true,
-		EnableDebuggingHandlers:  true,
-		HTTPCheckFrequency:       1 * time.Second,
-		FileCheckFrequency:       1 * time.Second,
-		StatusUpdateFrequency:    3 * time.Second,
-		PodStatusUpdateFrequency: 2 * time.Minute,
-		SyncFrequency:            3 * time.Second,
-		MinimumGCAge:             10 * time.Second,
-		MaxPerPodContainerCount:  5,
-		MaxContainerCount:        100,
-		MasterServiceNamespace:   masterServiceNamespace,
-		VolumePlugins:            volumePlugins,
-		TLSOptions:               tlsOptions,
-		CadvisorInterface:        cadvisorInterface,
-		ConfigFile:               configFilePath,
-		ImageGCPolicy:            imageGCPolicy,
+		Port:                    port,
+		Address:                 util.IP(net.ParseIP(address)),
+		EnableServer:            true,
+		EnableDebuggingHandlers: true,
+		HTTPCheckFrequency:      1 * time.Second,
+		FileCheckFrequency:      1 * time.Second,
+		StatusUpdateFrequency:   3 * time.Second,
+		SyncFrequency:           3 * time.Second,
+		MinimumGCAge:            10 * time.Second,
+		MaxPerPodContainerCount: 5,
+		MaxContainerCount:       100,
+		MasterServiceNamespace:  masterServiceNamespace,
+		VolumePlugins:           volumePlugins,
+		TLSOptions:              tlsOptions,
+		CadvisorInterface:       cadvisorInterface,
+		ConfigFile:              configFilePath,
+		ImageGCPolicy:           imageGCPolicy,
 	}
 	return &kcfg
 }
@@ -386,7 +381,6 @@ type KubeletConfig struct {
 	ConfigFile                     string
 	ManifestURL                    string
 	StatusUpdateFrequency          time.Duration
-	PodStatusUpdateFrequency       time.Duration
 	FileCheckFrequency             time.Duration
 	HTTPCheckFrequency             time.Duration
 	Hostname                       string
@@ -453,7 +447,6 @@ func createAndInitKubelet(kc *KubeletConfig, pc *config.PodConfig) (*kubelet.Kub
 		kc.Recorder,
 		kc.CadvisorInterface,
 		kc.StatusUpdateFrequency,
-		kc.PodStatusUpdateFrequency,
 		kc.ImageGCPolicy)
 
 	if err != nil {

diff --git a/pkg/kubelet/handlers.go b/pkg/kubelet/handlers.go
@@ -71,7 +71,7 @@ func ResolvePort(portReference util.IntOrString, container *api.Container) (int,
 func (h *httpActionHandler) Run(podFullName string, uid types.UID, container *api.Container, handler *api.Handler) error {
 	host := handler.HTTPGet.Host
 	if len(host) == 0 {
-		status, err := h.kubelet.GetPodStatus(podFullName, uid)
+		status, err := h.kubelet.GetPodStatus(podFullName)
 		if err != nil {
 			glog.Errorf("Unable to get pod info, event handlers may be invalid.")
 			return err