diff options
| -rw-r--r-- | edge/pkg/edged/edged.go | 9 | ||||
| -rw-r--r-- | edge/pkg/edged/images/image_gc_manager.go | 37 |
2 files changed, 4 insertions, 42 deletions
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go index e434f24ec..9a5267669 100644 --- a/edge/pkg/edged/edged.go +++ b/edge/pkg/edged/edged.go @@ -105,7 +105,6 @@ import ( "github.com/kubeedge/kubeedge/edge/pkg/edged/clcm" edgedconfig "github.com/kubeedge/kubeedge/edge/pkg/edged/config" fakekube "github.com/kubeedge/kubeedge/edge/pkg/edged/fake" - edgeimages "github.com/kubeedge/kubeedge/edge/pkg/edged/images" "github.com/kubeedge/kubeedge/edge/pkg/edged/podmanager" "github.com/kubeedge/kubeedge/edge/pkg/edged/server" "github.com/kubeedge/kubeedge/edge/pkg/edged/status" @@ -126,9 +125,9 @@ const ( MaxContainerBackOff = 300 * time.Second enqueueDuration = 10 * time.Second // ImageGCPeriod is the period for performing image garbage collection. - ImageGCPeriod = 5 * time.Second + ImageGCPeriod = 5 * time.Minute // ContainerGCPeriod is the period for performing container garbage collection. - ContainerGCPeriod = 60 * time.Second + ContainerGCPeriod = time.Minute // Period for performing global cleanup tasks. housekeepingPeriod = time.Second * 2 syncWorkQueuePeriod = time.Second * 2 @@ -468,7 +467,7 @@ func newEdged(enable bool) (*edged, error) { UID: types.UID(ed.nodeName), Namespace: "", } - statsProvider := edgeimages.NewStatsProvider() + containerGCPolicy := kubecontainer.GCPolicy{ MinAge: minAge, MaxContainers: -1, @@ -684,7 +683,7 @@ func newEdged(enable bool) (*edged, error) { imageGCManager, err := images.NewImageGCManager( ed.containerRuntime, - statsProvider, + ed.StatsProvider, recorder, nodeRef, policy, diff --git a/edge/pkg/edged/images/image_gc_manager.go b/edge/pkg/edged/images/image_gc_manager.go deleted file mode 100644 index 37ba51b91..000000000 --- a/edge/pkg/edged/images/image_gc_manager.go +++ /dev/null @@ -1,37 +0,0 @@ -package images - -import ( - "syscall" - - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" - "k8s.io/kubernetes/pkg/kubelet/images" - - "github.com/kubeedge/kubeedge/pkg/util" -) - -type imageGCManager struct { - imageGCPath string -} - -func (i *imageGCManager) ImageFsStats() (*statsapi.FsStats, error) { - fs := syscall.Statfs_t{} - err := syscall.Statfs(i.imageGCPath, &fs) - if err != nil { - return nil, err - } - cap := fs.Blocks * uint64(fs.Bsize) - ava := fs.Bfree * uint64(fs.Bsize) - used := (fs.Blocks - fs.Bfree) * uint64(fs.Bsize) - return &statsapi.FsStats{ - CapacityBytes: &cap, - AvailableBytes: &ava, - UsedBytes: &used, - }, nil -} - -//NewStatsProvider returns image status provider -func NewStatsProvider() images.StatsProvider { - return &imageGCManager{ - util.GetCurPath(), - } -} |