github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor list image to use new api

Browse Source
This commit is contained in:
Harry Zhang
2016-04-03 11:40:22 -04:00
parent 71f0d058b6
commit 7ecb44fe16
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/convert.go
View File

@@ -70,8 +70,8 @@ func toRuntimeContainer(c *dockertypes.Container) (*kubecontainer.Container, err
}, nil
}
// Converts docker.APIImages to kubecontainer.Image.
func toRuntimeImage(image *docker.APIImages) (*kubecontainer.Image, error) {
// Converts dockertypes.Image to kubecontainer.Image.
func toRuntimeImage(image *dockertypes.Image) (*kubecontainer.Image, error) {
if image == nil {
return nil, fmt.Errorf("unable to convert a nil pointer to a runtime image")
}

2
pkg/kubelet/dockertools/convert_test.go
View File

@@ -70,7 +70,7 @@ func TestToRuntimeContainer(t *testing.T) {
}
func TestToRuntimeImage(t *testing.T) {
original := &docker.APIImages{
original := &dockertypes.Image{
ID: "aeeea",
RepoTags: []string{"abc", "def"},
VirtualSize: 1234,

2
pkg/kubelet/dockertools/docker.go
View File

@@ -65,7 +65,7 @@ type DockerInterface interface {
StopContainer(id string, timeout int) error
RemoveContainer(id string, opts dockertypes.ContainerRemoveOptions) error
InspectImage(image string) (*docker.Image, error)
ListImages(opts docker.ListImagesOptions) ([]docker.APIImages, error)
ListImages(opts dockertypes.ImageListOptions) ([]dockertypes.Image, error)
PullImage(opts docker.PullImageOptions, auth docker.AuthConfiguration) error
RemoveImage(image string) error
Logs(string, dockertypes.ContainerLogsOptions, StreamOptions) error

5
pkg/kubelet/dockertools/fake_docker_client.go
View File

@@ -41,10 +41,11 @@ type FakeDockerClient struct {
ExitedContainerList []dockertypes.Container
ContainerMap map[string]*dockertypes.ContainerJSON
Image *docker.Image
Images []docker.APIImages
Images []dockertypes.Image
Errors map[string]error
called []string
pulled []string
// Created, Stopped and Removed all container docker ID
Created []string
Stopped []string
@@ -473,7 +474,7 @@ func (f *FakeDockerClient) InspectExec(id string) (*dockertypes.ContainerExecIns
return f.ExecInspect, f.popError("inspect_exec")
}
func (f *FakeDockerClient) ListImages(opts docker.ListImagesOptions) ([]docker.APIImages, error) {
func (f *FakeDockerClient) ListImages(opts dockertypes.ImageListOptions) ([]dockertypes.Image, error) {
err := f.popError("list_images")
return f.Images, err
}

2
pkg/kubelet/dockertools/instrumented_docker.go
View File

@@ -112,7 +112,7 @@ func (in instrumentedDockerInterface) InspectImage(image string) (*docker.Image,
return out, err
}
func (in instrumentedDockerInterface) ListImages(opts docker.ListImagesOptions) ([]docker.APIImages, error) {
func (in instrumentedDockerInterface) ListImages(opts dockertypes.ImageListOptions) ([]dockertypes.Image, error) {
const operation = "list_images"
defer recordOperation(operation, time.Now())

16
pkg/kubelet/dockertools/kube_docker_client.go
View File

@@ -157,20 +157,16 @@ func (d *kubeDockerClient) InspectImage(image string) (*docker.Image, error) {
return imageInfo, nil
}
func (d *kubeDockerClient) ListImages(opts docker.ListImagesOptions) ([]docker.APIImages, error) {
resp, err := d.client.ImageList(getDefaultContext(), dockertypes.ImageListOptions{
MatchName: opts.Filter,
All: opts.All,
Filters: convertFilters(opts.Filters),
})
func (d *kubeDockerClient) ListImages(opts dockertypes.ImageListOptions) ([]dockertypes.Image, error) {
images, err := d.client.ImageList(getDefaultContext(), opts)
if err != nil {
return nil, err
}
images := []docker.APIImages{}
if err = convertType(&resp, &images); err != nil {
return nil, err
dockerImages := []dockertypes.Image{}
for _, img := range images {
dockerImages = append(dockerImages, dockertypes.Image(img))
}
return images, nil
return dockerImages, nil
}
func base64EncodeAuth(auth docker.AuthConfiguration) (string, error) {

2
pkg/kubelet/dockertools/manager.go
View File

@@ -793,7 +793,7 @@ func (dm *DockerManager) GetPods(all bool) ([]*kubecontainer.Pod, error) {
func (dm *DockerManager) ListImages() ([]kubecontainer.Image, error) {
var images []kubecontainer.Image
dockerImages, err := dm.client.ListImages(docker.ListImagesOptions{})
dockerImages, err := dm.client.ListImages(dockertypes.ImageListOptions{})
if err != nil {
return images, err
}

2
pkg/kubelet/dockertools/manager_test.go
View File

@@ -359,7 +359,7 @@ func TestGetPods(t *testing.T) {
func TestListImages(t *testing.T) {
manager, fakeDocker := newTestDockerManager()
dockerImages := []docker.APIImages{{ID: "1111"}, {ID: "2222"}, {ID: "3333"}}
dockerImages := []dockertypes.Image{{ID: "1111"}, {ID: "2222"}, {ID: "3333"}}
expected := sets.NewString([]string{"1111", "2222", "3333"}...)
fakeDocker.Images = dockerImages