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

Remove cri SandboxInfo RuntimeHandler

Browse Source 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
This commit is contained in:
Jin Dong 2024-08-29 15:30:43 -07:00
parent dacde84372
commit 6f43197c25
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,6 @@ func toCRISandboxInfo(ctx context.Context, sb *types.PodSandbox) (map[string]str
si := &critypes.SandboxInfo{ si := &critypes.SandboxInfo{
Pid: sb.Status.Get().Pid, Pid: sb.Status.Get().Pid,
Config: sb.Metadata.Config, Config: sb.Metadata.Config,
RuntimeHandler: sb.Metadata.RuntimeHandler,
CNIResult: sb.Metadata.CNIResult, CNIResult: sb.Metadata.CNIResult,
Metadata: &sb.Metadata, Metadata: &sb.Metadata,
} }

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

@ -146,7 +146,6 @@ func toDeletedCRISandboxInfo(sandbox sandboxstore.Sandbox) (map[string]string, e
si := &types.SandboxInfo{ si := &types.SandboxInfo{
Pid: sandbox.Status.Get().Pid, Pid: sandbox.Status.Get().Pid,
Config: sandbox.Config, Config: sandbox.Config,
RuntimeHandler: sandbox.RuntimeHandler,
CNIResult: sandbox.CNIResult, CNIResult: sandbox.CNIResult,
} }

4
internal/cri/types/sandbox_info.go
View File

@ -33,10 +33,6 @@ type SandboxInfo struct {
Image string `json:"image"` Image string `json:"image"`
SnapshotKey string `json:"snapshotKey"` SnapshotKey string `json:"snapshotKey"`
Snapshotter string `json:"snapshotter"` Snapshotter string `json:"snapshotter"`
// Note: a new field `RuntimeHandler` has been added into the CRI PodSandboxStatus struct, and
// should be set. This `RuntimeHandler` field will be deprecated after containerd 1.3 (tracked
// in https://github.com/containerd/cri/issues/1064).
RuntimeHandler string `json:"runtimeHandler"` // see the Note above
RuntimeType string `json:"runtimeType"` RuntimeType string `json:"runtimeType"`
RuntimeOptions interface{} `json:"runtimeOptions"` RuntimeOptions interface{} `json:"runtimeOptions"`
Config *runtime.PodSandboxConfig `json:"config"` Config *runtime.PodSandboxConfig `json:"config"`