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

rkt: remove rkt image manager.

Browse Source 
This removes the dead code of rkt image manager as the generic
image manager is being used.
This commit is contained in:
Yifan Gu 2015-11-20 16:27:04 -08:00
parent e25aa2e1e3
commit 28e78f4fb8
3 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet.go
View File

@ -386,7 +386,6 @@ func NewMainKubelet(
return nil, err return nil, err
} }
klet.containerRuntime = rktRuntime klet.containerRuntime = rktRuntime
klet.imageManager = rkt.NewImageManager(rktRuntime)
klet.pleg = pleg.NewGenericPLEG(klet.containerRuntime, plegChannelCapacity, plegRelistPeriod) klet.pleg = pleg.NewGenericPLEG(klet.containerRuntime, plegChannelCapacity, plegRelistPeriod)
// No Docker daemon to put in a container. // No Docker daemon to put in a container.

43
pkg/kubelet/rkt/gc.go
View File

@ -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
}

1
pkg/kubelet/rkt/rkt.go
View File

@ -1401,7 +1401,6 @@ func parseImageInfo(input string) (*kubecontainer.Image, error) {
} }
// RemoveImage removes an on-disk image using 'rkt image rm'. // 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 { func (r *Runtime) RemoveImage(image kubecontainer.ImageSpec) error {
img, err := r.getImageByName(image.Image) img, err := r.getImageByName(image.Image)
if err != nil { if err != nil {