diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 8013c5fe878..09e2bb7a89f 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -405,7 +405,6 @@ func NewMainKubelet( return nil, err } klet.containerRuntime = rktRuntime - klet.imageManager = rkt.NewImageManager(rktRuntime) klet.pleg = pleg.NewGenericPLEG(klet.containerRuntime, plegChannelCapacity, plegRelistPeriod) // No Docker daemon to put in a container. diff --git a/pkg/kubelet/rkt/gc.go b/pkg/kubelet/rkt/gc.go deleted file mode 100644 index 555774de474..00000000000 --- a/pkg/kubelet/rkt/gc.go +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package rkt - -import "github.com/golang/glog" - -// ImageManager manages and garbage collects the container images for rkt. -type ImageManager struct { - runtime *Runtime -} - -func NewImageManager(r *Runtime) *ImageManager { - return &ImageManager{runtime: r} -} - -// GarbageCollect collects the images. -// TODO(yifan): Enforce ImageGCPolicy. -func (im *ImageManager) GarbageCollect() error { - if _, err := im.runtime.runCommand("image", "gc"); err != nil { - glog.Errorf("rkt: Failed to gc image: %v", err) - return err - } - return nil -} - -// Start is a no-op for rkt as we don't need to mark unused images in kubelet. -func (im *ImageManager) Start() error { - return nil -} diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index c5195fbbce0..5bfe3fa8e8b 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -1371,7 +1371,6 @@ func parseImageInfo(input string) (*kubecontainer.Image, error) { } // RemoveImage removes an on-disk image using 'rkt image rm'. -// TODO(yifan): Use image ID to reference image. func (r *Runtime) RemoveImage(image kubecontainer.ImageSpec) error { img, err := r.getImageByName(image.Image) if err != nil {