github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7785 from vmarmol/fix-start

Browse Source 
Start ImageManager housekeeping in Run().
This commit is contained in:
Yu-Ju Hong 2015-05-05 12:00:00 -07:00
commit 08d25c3ed4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/image_manager.go
View File

@ -39,6 +39,9 @@ type imageManager interface {
// enough space as per the garbage collection policy. // enough space as per the garbage collection policy.
GarbageCollect() error GarbageCollect() error
// Start async garbage collection of images.
Start() error
// TODO(vmarmol): Have this subsume pulls as well. // TODO(vmarmol): Have this subsume pulls as well.
} }
@ -104,15 +107,10 @@ func newImageManager(dockerClient dockertools.DockerInterface, cadvisorInterface
nodeRef: nodeRef, nodeRef: nodeRef,
} }
err := im.start()
if err != nil {
return nil, fmt.Errorf("failed to start image manager: %v", err)
}
return im, nil return im, nil
} }
func (im *realImageManager) start() error { func (im *realImageManager) Start() error {
// Initial detection make detected time "unknown" in the past. // Initial detection make detected time "unknown" in the past.
var zero time.Time var zero time.Time
err := im.detectImages(zero) err := im.detectImages(zero)

6
pkg/kubelet/kubelet.go
View File

@ -600,6 +600,12 @@ func (kl *Kubelet) Run(updates <-chan PodUpdate) {
glog.Infof("Running in container %q", kl.resourceContainer) glog.Infof("Running in container %q", kl.resourceContainer)
} }
err := kl.imageManager.Start()
if err != nil {
kl.recorder.Eventf(kl.nodeRef, "imageManagerFailed", "Failed to start ImageManager %v", err)
glog.Errorf("Failed to start ImageManager, images may not be garbage collected: %v", err)
}
go kl.syncNodeStatus() go kl.syncNodeStatus()
// Run the system oom watcher forever. // Run the system oom watcher forever.
go util.Until(kl.runOOMWatcher, time.Second, util.NeverStop) go util.Until(kl.runOOMWatcher, time.Second, util.NeverStop)