github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10471 from bprashanth/master_list

Browse Source 
Kubelet doesn't fight apiserver for cputime on the master.
This commit is contained in:
Alex Robinson 2015-06-29 10:22:00 -07:00
commit 143bfeb40e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/status_manager.go
View File

@ -64,6 +64,13 @@ func isStatusEqual(oldStatus, status *api.PodStatus) bool {
} }
func (s *statusManager) Start() { func (s *statusManager) Start() {
// Don't start the status manager if we don't have a client. This will happen
// on the master, where the kubelet is responsible for bootstrapping the pods
// of the master components.
if s.kubeClient == nil {
glog.Infof("Kubernetes client is nil, not starting status manager.")
return
}
// syncBatch blocks when no updates are available, we can run it in a tight loop. // syncBatch blocks when no updates are available, we can run it in a tight loop.
glog.Info("Starting to sync pod status with apiserver") glog.Info("Starting to sync pod status with apiserver")
go util.Forever(func() { go util.Forever(func() {
@ -142,10 +149,6 @@ func (s *statusManager) RemoveOrphanedStatuses(podFullNames map[string]bool) {
// syncBatch syncs pods statuses with the apiserver. // syncBatch syncs pods statuses with the apiserver.
func (s *statusManager) syncBatch() error { func (s *statusManager) syncBatch() error {
if s.kubeClient == nil {
glog.V(4).Infof("Kubernetes client is nil, skipping pod status updates")
return nil
}
syncRequest := <-s.podStatusChannel syncRequest := <-s.podStatusChannel
pod := syncRequest.pod pod := syncRequest.pod
podFullName := kubecontainer.GetPodFullName(pod) podFullName := kubecontainer.GetPodFullName(pod)