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

Merge pull request #7812 from mxpv/cri

Browse Source 
Minor fix when querying pod sandbox status
This commit is contained in:
Phil Estes 2022-12-14 10:15:03 -05:00 committed by GitHub
commit 9b39b0bfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cri/sbserver/sandbox_status.go
View File

@ -51,9 +51,9 @@ func (c *criService) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
status := toCRISandboxStatus(sandbox.Metadata, statusResponse.State, statusResponse.GetCreatedAt().AsTime(), ip, additionalIPs) status := toCRISandboxStatus(sandbox.Metadata, statusResponse.State, statusResponse.GetCreatedAt().AsTime(), ip, additionalIPs)
if status.GetCreatedAt() == 0 { if status.GetCreatedAt() == 0 {
// CRI doesn't allow CreatedAt == 0. // CRI doesn't allow CreatedAt == 0.
sandboxInfo, err := c.client.SandboxStore().Get(ctx, r.GetPodSandboxId()) sandboxInfo, err := c.client.SandboxStore().Get(ctx, sandbox.ID)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get sandbox %q from metadata store: %w", r.GetPodSandboxId(), err) return nil, fmt.Errorf("failed to get sandbox %q from metadata store: %w", sandbox.ID, err)
} }
status.CreatedAt = sandboxInfo.CreatedAt.UnixNano() status.CreatedAt = sandboxInfo.CreatedAt.UnixNano()
} }