github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

fix image manager Start() function return

Browse Source 
realImageGCManager's Start()  function will always return nil,we do not need the err return value,drop it.
This commit is contained in:
NickrenREN 2016-12-21 14:58:00 +08:00
parent 64a0e0ee19
commit bb5ccb978e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/images/image_gc_manager.go
View File

@ -44,7 +44,7 @@ type ImageGCManager interface {
GarbageCollect() error
// Start async garbage collection of images.
Start() error
Start()
GetImageList() ([]kubecontainer.Image, error)
@ -152,7 +152,7 @@ func NewImageGCManager(runtime container.Runtime, cadvisorInterface cadvisor.Int
return im, nil
}
func (im *realImageGCManager) Start() error {
func (im *realImageGCManager) Start() {
go wait.Until(func() {
// Initial detection make detected time "unknown" in the past.
var ts time.Time
@ -178,7 +178,6 @@ func (im *realImageGCManager) Start() error {
}
}, 30*time.Second, wait.NeverStop)
return nil
}
// Get a list of images on this node

4
pkg/kubelet/kubelet.go
View File

@ -1177,9 +1177,7 @@ func (kl *Kubelet) initializeModules() error {
}
// Step 4: Start the image manager.
if err := kl.imageManager.Start(); err != nil {
return fmt.Errorf("Failed to start ImageManager, images may not be garbage collected: %v", err)
}
kl.imageManager.Start()
// Step 5: Start container manager.
node, err := kl.getNodeAnyWay()