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

Merge pull request #29388 from ronnielai/image-gc-check

Browse Source 
Automatic merge from submit-queue

Avoiding trying to gc images with no tags which are still in use

#29325
This commit is contained in:
k8s-merge-robot
2016-07-27 16:44:50 -07:00
committed by GitHub
parent 3301f6d14f 64981aaf46
commit ab7d039c81
7 changed files with 102 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
pkg/kubelet/rkt/rkt_test.go
View File

@@ -374,18 +374,20 @@ func TestGetPods(t *testing.T) {
Namespace: "default",
Containers: []*kubecontainer.Container{
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-1"),
Name: "app-1",
Image: "img-name-1:latest",
Hash: 1001,
State: "running",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-1"),
Name: "app-1",
Image: "img-name-1:latest",
ImageID: "img-id-1",
Hash: 1001,
State: "running",
},
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-2"),
Name: "app-2",
Image: "img-name-2:latest",
Hash: 1002,
State: "exited",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-2"),
Name: "app-2",
Image: "img-name-2:latest",
ImageID: "img-id-2",
Hash: 1002,
State: "exited",
},
},
},
@@ -435,18 +437,20 @@ func TestGetPods(t *testing.T) {
Namespace: "default",
Containers: []*kubecontainer.Container{
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-1"),
Name: "app-1",
Image: "img-name-1:latest",
Hash: 1001,
State: "running",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-1"),
Name: "app-1",
Image: "img-name-1:latest",
ImageID: "img-id-1",
Hash: 1001,
State: "running",
},
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-2"),
Name: "app-2",
Image: "img-name-2:latest",
Hash: 1002,
State: "exited",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4002:app-2"),
Name: "app-2",
Image: "img-name-2:latest",
ImageID: "img-id-2",
Hash: 1002,
State: "exited",
},
},
},
@@ -456,32 +460,36 @@ func TestGetPods(t *testing.T) {
Namespace: "default",
Containers: []*kubecontainer.Container{
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4003:app-11"),
Name: "app-11",
Image: "img-name-11:latest",
Hash: 10011,
State: "exited",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4003:app-11"),
Name: "app-11",
Image: "img-name-11:latest",
ImageID: "img-id-11",
Hash: 10011,
State: "exited",
},
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4003:app-22"),
Name: "app-22",
Image: "img-name-22:latest",
Hash: 10022,
State: "exited",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4003:app-22"),
Name: "app-22",
Image: "img-name-22:latest",
ImageID: "img-id-22",
Hash: 10022,
State: "exited",
},
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4004:app-11"),
Name: "app-11",
Image: "img-name-11:latest",
Hash: 10011,
State: "running",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4004:app-11"),
Name: "app-11",
Image: "img-name-11:latest",
ImageID: "img-id-11",
Hash: 10011,
State: "running",
},
{
ID: kubecontainer.BuildContainerID("rkt", "uuid-4004:app-22"),
Name: "app-22",
Image: "img-name-22:latest",
Hash: 10022,
State: "running",
ID: kubecontainer.BuildContainerID("rkt", "uuid-4004:app-22"),
Name: "app-22",
Image: "img-name-22:latest",
ImageID: "img-id-22",
Hash: 10022,
State: "running",
},
},
},