kubelet: Remove redundant Container.Created

This has been supplanted by a) the DockerJSON.CreatedAt field and b) the
ContainerStatus.CreatedAt, where the first is used for creating the
second.

The `.Created` field was only written to as far as I can see.
This commit is contained in:
Euan Kemp
2016-04-20 23:32:28 -07:00
parent daf6be1a66
commit 7d34b0b09d
6 changed files with 65 additions and 82 deletions

View File

@@ -95,7 +95,6 @@ func ConvertPodStatusToRunningPod(podStatus *PodStatus) Pod {
Name: containerStatus.Name,
Image: containerStatus.Image,
Hash: containerStatus.Hash,
Created: containerStatus.CreatedAt.Unix(),
State: containerStatus.State,
}
runningPod.Containers = append(runningPod.Containers, container)

View File

@@ -226,9 +226,6 @@ type Container struct {
// Hash of the container, used for comparison. Optional for containers
// not managed by kubelet.
Hash uint64
// The timestamp of the creation time of the container.
// TODO(yifan): Consider to move it to api.ContainerStatus.
Created int64
// State is the state of the container.
State ContainerState
}

View File

@@ -60,7 +60,6 @@ func toRuntimeContainer(c *dockertypes.Container) (*kubecontainer.Container, err
Name: dockerName.ContainerName,
Image: c.Image,
Hash: hash,
Created: c.Created,
// (random-liu) docker uses status to indicate whether a container is running or exited.
// However, in kubernetes we usually use state to indicate whether a container is running or exited,
// while use status to indicate the comprehensive status of the container. So we have different naming

View File

@@ -46,7 +46,6 @@ func TestToRuntimeContainer(t *testing.T) {
original := &dockertypes.Container{
ID: "ab2cdf",
Image: "bar_image",
Created: 12345,
Names: []string{"/k8s_bar.5678_foo_ns_1234_42"},
Status: "Up 5 hours",
}
@@ -55,7 +54,6 @@ func TestToRuntimeContainer(t *testing.T) {
Name: "bar",
Image: "bar_image",
Hash: 0x5678,
Created: 12345,
State: kubecontainer.ContainerStateRunning,
}

View File

@@ -811,7 +811,6 @@ func apiPodToruntimePod(uuid string, pod *api.Pod) *kubecontainer.Pod {
Name: c.Name,
Image: c.Image,
Hash: kubecontainer.HashContainer(c),
Created: time.Now().Unix(),
})
}
return p
@@ -1114,7 +1113,6 @@ func (r *Runtime) convertRktPod(rktpod *rktapi.Pod) (*kubecontainer.Pod, error)
Image: fmt.Sprintf("%s:%s", app.Image.Name, app.Image.Version),
Hash: containerHash,
State: appStateToContainerState(app.State),
Created: time.Unix(0, rktpod.CreatedAt).Unix(), // convert ns to s
})
}

View File

@@ -383,7 +383,6 @@ func TestGetPods(t *testing.T) {
Name: "app-1",
Image: "img-name-1:latest",
Hash: 1001,
Created: 10,
State: "running",
},
{
@@ -391,7 +390,6 @@ func TestGetPods(t *testing.T) {
Name: "app-2",
Image: "img-name-2:latest",
Hash: 1002,
Created: 10,
State: "exited",
},
},
@@ -443,7 +441,6 @@ func TestGetPods(t *testing.T) {
Name: "app-1",
Image: "img-name-1:latest",
Hash: 1001,
Created: 10,
State: "running",
},
{
@@ -451,7 +448,6 @@ func TestGetPods(t *testing.T) {
Name: "app-2",
Image: "img-name-2:latest",
Hash: 1002,
Created: 10,
State: "exited",
},
},
@@ -466,7 +462,6 @@ func TestGetPods(t *testing.T) {
Name: "app-11",
Image: "img-name-11:latest",
Hash: 10011,
Created: 30,
State: "exited",
},
{
@@ -474,7 +469,6 @@ func TestGetPods(t *testing.T) {
Name: "app-22",
Image: "img-name-22:latest",
Hash: 10022,
Created: 30,
State: "exited",
},
{
@@ -482,7 +476,6 @@ func TestGetPods(t *testing.T) {
Name: "app-11",
Image: "img-name-11:latest",
Hash: 10011,
Created: 50,
State: "running",
},
{
@@ -490,7 +483,6 @@ func TestGetPods(t *testing.T) {
Name: "app-22",
Image: "img-name-22:latest",
Hash: 10022,
Created: 50,
State: "running",
},
},