Show runtime handler in sandbox debug info.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-09-16 21:27:51 -07:00
parent e402ae2f02
commit 4b45e16a4b
4 changed files with 20 additions and 16 deletions

View File

@ -113,7 +113,6 @@ type containerInfo struct {
} }
// toCRIContainerInfo converts internal container object information to CRI container status response info map. // toCRIContainerInfo converts internal container object information to CRI container status response info map.
// TODO(random-liu): Return error instead of logging.
func toCRIContainerInfo(ctx context.Context, container containerstore.Container, verbose bool) (map[string]string, error) { func toCRIContainerInfo(ctx context.Context, container containerstore.Container, verbose bool) (map[string]string, error) {
if !verbose { if !verbose {
return nil, nil return nil, nil

View File

@ -77,6 +77,7 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
ID: id, ID: id,
Name: name, Name: name,
Config: config, Config: config,
RuntimeHandler: r.GetRuntimeHandler(),
}, },
sandboxstore.Status{ sandboxstore.Status{
State: sandboxstore.StateUnknown, State: sandboxstore.StateUnknown,

View File

@ -108,6 +108,7 @@ 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"`
RuntimeHandler string `json:"runtimeHandler"`
Runtime *criconfig.Runtime `json:"runtime"` Runtime *criconfig.Runtime `json:"runtime"`
Config *runtime.PodSandboxConfig `json:"config"` Config *runtime.PodSandboxConfig `json:"config"`
RuntimeSpec *runtimespec.Spec `json:"runtimeSpec"` RuntimeSpec *runtimespec.Spec `json:"runtimeSpec"`
@ -133,6 +134,7 @@ func toCRISandboxInfo(ctx context.Context, sandbox sandboxstore.Sandbox) (map[st
si := &sandboxInfo{ si := &sandboxInfo{
Pid: sandbox.Status.Get().Pid, Pid: sandbox.Status.Get().Pid,
RuntimeHandler: sandbox.RuntimeHandler,
Status: string(processStatus), Status: string(processStatus),
Config: sandbox.Config, Config: sandbox.Config,
} }

View File

@ -54,6 +54,8 @@ type Metadata struct {
NetNSPath string NetNSPath string
// IP of Pod if it is attached to non host network // IP of Pod if it is attached to non host network
IP string IP string
// RuntimeHandler is the runtime handler name of the pod.
RuntimeHandler string
} }
// MarshalJSON encodes Metadata into bytes in json format. // MarshalJSON encodes Metadata into bytes in json format.