Commit 284dfb27 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #39275 from ivan4th/fix-bad-fake-runtime-time-values

Automatic merge from submit-queue Fix bad time values in kubelet FakeRuntimeService These values don't affect tests but they can be confusing for developers looking at the code for reference.
parents 6748c009 7a4ecc5c
...@@ -128,7 +128,7 @@ func (r *FakeRuntimeService) RunPodSandbox(config *runtimeapi.PodSandboxConfig) ...@@ -128,7 +128,7 @@ func (r *FakeRuntimeService) RunPodSandbox(config *runtimeapi.PodSandboxConfig)
// PodSandboxID should be randomized for real container runtime, but here just use // PodSandboxID should be randomized for real container runtime, but here just use
// fixed name from BuildSandboxName() for easily making fake sandboxes. // fixed name from BuildSandboxName() for easily making fake sandboxes.
podSandboxID := BuildSandboxName(config.Metadata) podSandboxID := BuildSandboxName(config.Metadata)
createdAt := time.Now().Unix() createdAt := time.Now().UnixNano()
r.Sandboxes[podSandboxID] = &FakePodSandbox{ r.Sandboxes[podSandboxID] = &FakePodSandbox{
PodSandboxStatus: runtimeapi.PodSandboxStatus{ PodSandboxStatus: runtimeapi.PodSandboxStatus{
Id: podSandboxID, Id: podSandboxID,
...@@ -238,7 +238,7 @@ func (r *FakeRuntimeService) CreateContainer(podSandboxID string, config *runtim ...@@ -238,7 +238,7 @@ func (r *FakeRuntimeService) CreateContainer(podSandboxID string, config *runtim
// ContainerID should be randomized for real container runtime, but here just use // ContainerID should be randomized for real container runtime, but here just use
// fixed BuildContainerName() for easily making fake containers. // fixed BuildContainerName() for easily making fake containers.
containerID := BuildContainerName(config.Metadata, podSandboxID) containerID := BuildContainerName(config.Metadata, podSandboxID)
createdAt := time.Now().Unix() createdAt := time.Now().UnixNano()
createdState := runtimeapi.ContainerState_CONTAINER_CREATED createdState := runtimeapi.ContainerState_CONTAINER_CREATED
imageRef := config.Image.Image imageRef := config.Image.Image
r.Containers[containerID] = &FakeContainer{ r.Containers[containerID] = &FakeContainer{
...@@ -271,7 +271,7 @@ func (r *FakeRuntimeService) StartContainer(containerID string) error { ...@@ -271,7 +271,7 @@ func (r *FakeRuntimeService) StartContainer(containerID string) error {
// Set container to running. // Set container to running.
c.State = runtimeapi.ContainerState_CONTAINER_RUNNING c.State = runtimeapi.ContainerState_CONTAINER_RUNNING
c.StartedAt = time.Now().Unix() c.StartedAt = time.Now().UnixNano()
return nil return nil
} }
...@@ -288,7 +288,7 @@ func (r *FakeRuntimeService) StopContainer(containerID string, timeout int64) er ...@@ -288,7 +288,7 @@ func (r *FakeRuntimeService) StopContainer(containerID string, timeout int64) er
} }
// Set container to exited state. // Set container to exited state.
finishedAt := time.Now().Unix() finishedAt := time.Now().UnixNano()
exitedState := runtimeapi.ContainerState_CONTAINER_EXITED exitedState := runtimeapi.ContainerState_CONTAINER_EXITED
c.State = exitedState c.State = exitedState
c.FinishedAt = finishedAt c.FinishedAt = finishedAt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment