Merge pull request containerd#10740 from zouyee/event

Maksym Pavlenko · web-flow · commit 86e0f52e17fd · 2024-09-28T00:11:16.000Z
Add timestamp to PodSandboxStatusResponse for kubernetes Evented PLEG
diff --git a/internal/cri/server/sandbox_status.go b/internal/cri/server/sandbox_status.go
@@ -46,6 +46,7 @@ func (c *criService) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
 		state     string
 		info      map[string]string
 	)
+	timestamp := time.Now().UnixNano()
 	cstatus, err := c.sandboxService.SandboxStatus(ctx, sandbox.Sandboxer, sandbox.ID, r.GetVerbose())
 	if err != nil {
 		// If the shim died unexpectedly (segfault etc.) let's set the state as
@@ -83,8 +84,9 @@ func (c *criService) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
 	}
 
 	return &runtime.PodSandboxStatusResponse{
-		Status: status,
-		Info:   info,
+		Status:    status,
+		Info:      info,
+		Timestamp: timestamp,
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ func (c criService) PodSandboxStatus(ctx context.Context, r runtime.PodSandbox`
`46`	`46`	`state string`
`47`	`47`	`info map[string]string`
`48`	`48`	`)`
	`49`	`+ timestamp := time.Now().UnixNano()`
`49`	`50`	`cstatus, err := c.sandboxService.SandboxStatus(ctx, sandbox.Sandboxer, sandbox.ID, r.GetVerbose())`
`50`	`51`	`if err != nil {`
`51`	`52`	`// If the shim died unexpectedly (segfault etc.) let's set the state as`
`@@ -83,8 +84,9 @@ func (c criService) PodSandboxStatus(ctx context.Context, r runtime.PodSandbox`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`return &runtime.PodSandboxStatusResponse{`
`86`		`- Status: status,`
`87`		`- Info: info,`
	`87`	`+ Status: status,`
	`88`	`+ Info: info,`
	`89`	`+ Timestamp: timestamp,`
`88`	`90`	`}, nil`
`89`	`91`	`}`
`90`	`92`