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

Merge pull request #10656 from djdongjin/remove-cri-SandboxInfo-RuntimeHandler

Browse Source 
Remove deprecated cri SandboxInfo RuntimeHandler
This commit is contained in:
Akihiro Suda
2024-10-17 05:23:12 +00:00
committed by GitHub
parent 3a6e5fcb11 6f43197c25
commit 6c386c343d
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/cri/server/podsandbox/sandbox_status.go
View File

@@ -61,11 +61,10 @@ func (c *Controller) Status(ctx context.Context, sandboxID string, verbose bool)
// toCRISandboxInfo converts internal container object information to CRI sandbox status response info map.
func toCRISandboxInfo(ctx context.Context, sb *types.PodSandbox) (map[string]string, error) {
si := &critypes.SandboxInfo{
Pid: sb.Status.Get().Pid,
Config: sb.Metadata.Config,
RuntimeHandler: sb.Metadata.RuntimeHandler,
CNIResult: sb.Metadata.CNIResult,
Metadata: &sb.Metadata,
Pid: sb.Status.Get().Pid,
Config: sb.Metadata.Config,
CNIResult: sb.Metadata.CNIResult,
Metadata: &sb.Metadata,
}
if container := sb.Container; container != nil {

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

@@ -146,10 +146,9 @@ func toCRISandboxStatus(meta sandboxstore.Metadata, status string, createdAt tim
// we should fallback to get SandboxInfo from cached sandbox itself.
func toDeletedCRISandboxInfo(sandbox sandboxstore.Sandbox) (map[string]string, error) {
si := &types.SandboxInfo{
Pid: sandbox.Status.Get().Pid,
Config: sandbox.Config,
RuntimeHandler: sandbox.RuntimeHandler,
CNIResult: sandbox.CNIResult,
Pid: sandbox.Status.Get().Pid,
Config: sandbox.Config,
CNIResult: sandbox.CNIResult,
}
// If processStatus is empty, it means that the task is deleted. Apply "deleted"