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

Remove deprecated cri SandboxInfo RuntimeHandler

internal/cri/server/podsandbox/sandbox_status.go

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

internal/cri/server/sandbox_status.go

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

internal/cri/types/sandbox_info.go

@@ -33,10 +33,6 @@ type SandboxInfo struct {
 	Image          string                    `json:"image"`
 	SnapshotKey    string                    `json:"snapshotKey"`
 	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"`
 	RuntimeOptions interface{}               `json:"runtimeOptions"`
 	Config         *runtime.PodSandboxConfig `json:"config"`