implement PodSandboxStatus support

Signed-off-by: Michael Zappa <michael.zappa@gmail.com>

Author: MikeZappa87

pkg/adaptation/adaptation.go

@@ -238,6 +238,29 @@ func (r *Adaptation) UpdatePodSandbox(ctx context.Context, req *UpdatePodSandbox
 	return &UpdatePodSandboxResponse{}, nil
 }
 
+// PodSandboxStatus relays the corresponding CRI request to plugins.
+// If a plugin returns IP addresses, those will be returned to the caller.
+// The last plugin to return non-empty IPs wins.
+func (r *Adaptation) PodSandboxStatus(ctx context.Context, req *PodSandboxStatusRequest) (*PodSandboxStatusResponse, error) {
+	r.Lock()
+	defer r.Unlock()
+	defer r.removeClosedPlugins()
+
+	rsp := &PodSandboxStatusResponse{}
+	for _, plugin := range r.plugins {
+		pluginRsp, err := plugin.podSandboxStatus(ctx, req)
+		if err != nil {
+			return nil, err
+		}
+		// Use the last plugin's non-empty IP response
+		if pluginRsp != nil && (pluginRsp.Ip != "" || len(pluginRsp.AdditionalIps) > 0) {
+			rsp = pluginRsp
+		}
+	}
+
+	return rsp, nil
+}
+
 // PostUpdatePodSandbox relays the corresponding CRI event to plugins.
 func (r *Adaptation) PostUpdatePodSandbox(ctx context.Context, evt *StateChangeEvent) error {
 	evt.Event = Event_POST_UPDATE_POD_SANDBOX

pkg/adaptation/api.go

@@ -53,6 +53,8 @@ type (
 	RunPodSandboxRequest         = api.RunPodSandboxRequest
 	UpdatePodSandboxRequest      = api.UpdatePodSandboxRequest
 	UpdatePodSandboxResponse     = api.UpdatePodSandboxResponse
+	PodSandboxStatusRequest      = api.PodSandboxStatusRequest
+	PodSandboxStatusResponse     = api.PodSandboxStatusResponse
 	StopPodSandboxRequest        = api.StopPodSandboxRequest
 	RemovePodSandboxRequest      = api.RemovePodSandboxRequest
 	PostUpdatePodSandboxRequest  = api.PostUpdatePodSandboxRequest
@@ -127,6 +129,7 @@ const (
 	Event_STOP_CONTAINER                = api.Event_STOP_CONTAINER
 	Event_REMOVE_CONTAINER              = api.Event_REMOVE_CONTAINER
 	Event_VALIDATE_CONTAINER_ADJUSTMENT = api.Event_VALIDATE_CONTAINER_ADJUSTMENT
+	Event_POD_SANDBOX_STATUS            = api.Event_POD_SANDBOX_STATUS
 	ValidEvents                         = api.ValidEvents
 
 	ContainerState_CONTAINER_UNKNOWN = api.ContainerState_CONTAINER_UNKNOWN

pkg/adaptation/builtin/plugin.go

@@ -43,6 +43,7 @@ type BuiltinHandlers struct {
 	RemovePodSandbox     func(context.Context, *api.RemovePodSandboxRequest) error
 	UpdatePodSandbox     func(context.Context, *api.UpdatePodSandboxRequest) (*api.UpdatePodSandboxResponse, error)
 	PostUpdatePodSandbox func(context.Context, *api.PostUpdatePodSandboxRequest) error
+	PodSandboxStatus     func(context.Context, *api.PodSandboxStatusRequest) (*api.PodSandboxStatusResponse, error)
 
 	CreateContainer             func(context.Context, *api.CreateContainerRequest) (*api.CreateContainerResponse, error)
 	PostCreateContainer         func(context.Context, *api.PostCreateContainerRequest) error
@@ -84,6 +85,9 @@ func (b *BuiltinPlugin) Configure(ctx context.Context, req *api.ConfigureRequest
 		if b.Handlers.PostUpdatePodSandbox != nil {
 			events.Set(api.Event_POST_UPDATE_POD_SANDBOX)
 		}
+		if b.Handlers.PodSandboxStatus != nil {
+			events.Set(api.Event_POD_SANDBOX_STATUS)
+		}
 		if b.Handlers.CreateContainer != nil {
 			events.Set(api.Event_CREATE_CONTAINER)
 		}
@@ -204,6 +208,14 @@ func (b *BuiltinPlugin) UpdatePodSandbox(ctx context.Context, req *api.UpdatePod
 	return &api.UpdatePodSandboxResponse{}, nil
 }
 
+// PodSandboxStatus implements PluginService of the NRI API.
+func (b *BuiltinPlugin) PodSandboxStatus(ctx context.Context, req *api.PodSandboxStatusRequest) (*api.PodSandboxStatusResponse, error) {
+	if b.Handlers.PodSandboxStatus != nil {
+		return b.Handlers.PodSandboxStatus(ctx, req)
+	}
+	return &api.PodSandboxStatusResponse{}, nil
+}
+
 // PostUpdatePodSandbox is a handler for the PostUpdatePodSandbox event.
 func (b *BuiltinPlugin) PostUpdatePodSandbox(ctx context.Context, req *api.PostUpdatePodSandboxRequest) error {
 	if b.Handlers.PostUpdatePodSandbox != nil {

pkg/adaptation/plugin.go

@@ -686,6 +686,28 @@ func (p *plugin) updatePodSandbox(ctx context.Context, req *UpdatePodSandboxRequ
 	return &UpdatePodSandboxResponse{}, nil
 }
 
+func (p *plugin) podSandboxStatus(ctx context.Context, req *PodSandboxStatusRequest) (*PodSandboxStatusResponse, error) {
+	if !p.events.IsSet(Event_POD_SANDBOX_STATUS) {
+		return nil, nil
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, getPluginRequestTimeout())
+	defer cancel()
+
+	rsp, err := p.impl.PodSandboxStatus(ctx, req)
+	if err != nil {
+		if isFatalError(err) {
+			log.Errorf(ctx, "closing plugin %s, failed to handle event %d: %v",
+				p.name(), Event_POD_SANDBOX_STATUS, err)
+			p.close()
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	return rsp, nil
+}
+
 // Relay other pod or container state change events to the plugin.
 func (p *plugin) StateChange(ctx context.Context, evt *StateChangeEvent) (err error) {
 	if !p.events.IsSet(evt.Event) {

pkg/adaptation/plugin_type.go

@@ -123,6 +123,19 @@ func (p *pluginType) UpdatePodSandbox(ctx context.Context, req *UpdatePodSandbox
 	return nil, errUnknownImpl
 }
 
+func (p *pluginType) PodSandboxStatus(ctx context.Context, req *PodSandboxStatusRequest) (*PodSandboxStatusResponse, error) {
+	switch {
+	case p.ttrpcImpl != nil:
+		return p.ttrpcImpl.PodSandboxStatus(ctx, req)
+	case p.builtinImpl != nil:
+		return p.builtinImpl.PodSandboxStatus(ctx, req)
+	case p.wasmImpl != nil:
+		return p.wasmImpl.PodSandboxStatus(ctx, req)
+	}
+
+	return nil, errUnknownImpl
+}
+
 func (p *pluginType) StateChange(ctx context.Context, req *StateChangeEvent) (err error) {
 	switch {
 	case p.ttrpcImpl != nil: