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

Merge pull request #11403 from k8s-infra-cherrypick-robot/cherry-pick-11323-to-release/2.0

Browse Source 
[release/2.0] Revert "Add timestamp to PodSandboxStatusResponse for kubernetes Evented PLEG"
This commit is contained in:
Akihiro Suda
2025-02-25 12:41:15 +09:00
committed by GitHub
parent 6a3f071b8b b5313993c1
commit 6b4c4a19f5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cri/server/sandbox_status.go
View File

@@ -46,7 +46,6 @@ func (c *criService) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
state string state string
info map[string]string info map[string]string
) )
timestamp := time.Now().UnixNano()
cstatus, err := c.sandboxService.SandboxStatus(ctx, sandbox.Sandboxer, sandbox.ID, r.GetVerbose()) cstatus, err := c.sandboxService.SandboxStatus(ctx, sandbox.Sandboxer, sandbox.ID, r.GetVerbose())
if err != nil { if err != nil {
// If the shim died unexpectedly (segfault etc.) let's set the state as // If the shim died unexpectedly (segfault etc.) let's set the state as
@@ -86,7 +85,6 @@ func (c *criService) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
return &runtime.PodSandboxStatusResponse{ return &runtime.PodSandboxStatusResponse{
Status: status, Status: status,
Info: info, Info: info,
Timestamp: timestamp,
}, nil }, nil
} }