Move PLEG event back to CRI

mxpv · mxpv · commit 246240f71ce2 · 2023-05-31T11:44:52.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/pkg/cri/sbserver/podsandbox/controller.go b/pkg/cri/sbserver/podsandbox/controller.go
@@ -45,10 +45,6 @@ type CRIService interface {
 
 	// TODO: we should implement Event backoff in Controller.
 	BackOffEvent(id string, event interface{})
-
-	// TODO: refactor event generator for PLEG.
-	// GenerateAndSendContainerEvent is called by controller for sandbox container events.
-	GenerateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType)
 }
 
 type Controller struct {
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_delete.go b/pkg/cri/sbserver/podsandbox/sandbox_delete.go
@@ -20,8 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
-
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
@@ -59,10 +57,5 @@ func (c *Controller) Shutdown(ctx context.Context, sandboxID string) error {
 		}
 	}
 
-	// Send CONTAINER_DELETED event with ContainerId equal to SandboxId.
-	c.cri.GenerateAndSendContainerEvent(ctx, sandboxID, sandboxID, runtime.ContainerEventType_CONTAINER_DELETED_EVENT)
-
-	c.sandboxStore.Delete(sandboxID)
-
 	return nil
 }
diff --git a/pkg/cri/sbserver/sandbox_remove.go b/pkg/cri/sbserver/sandbox_remove.go
@@ -90,6 +90,9 @@ func (c *criService) RemovePodSandbox(ctx context.Context, r *runtime.RemovePodS
 		return nil, fmt.Errorf("failed to delete sandbox %q: %w", id, err)
 	}
 
+	// Send CONTAINER_DELETED event with ContainerId equal to SandboxId.
+	c.generateAndSendContainerEvent(ctx, id, id, runtime.ContainerEventType_CONTAINER_DELETED_EVENT)
+
 	err = c.nri.RemovePodSandbox(ctx, &sandbox)
 	if err != nil {
 		log.G(ctx).WithError(err).Errorf("NRI pod removal notification failed")
diff --git a/pkg/cri/sbserver/service.go b/pkg/cri/sbserver/service.go
@@ -205,12 +205,6 @@ func (c *criService) BackOffEvent(id string, event interface{}) {
 	c.eventMonitor.backOff.enBackOff(id, event)
 }
 
-// GenerateAndSendContainerEvent is a temporary workaround to send PLEG events from podsandbopx/ controller
-// TODO: refactor PLEG event generator so both podsandbox/ controller and CRI service can access it.
-func (c *criService) GenerateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType) {
-	c.generateAndSendContainerEvent(ctx, containerID, sandboxID, eventType)
-}
-
 // Register registers all required services onto a specific grpc server.
 // This is used by containerd cri plugin.
 func (c *criService) Register(s *grpc.Server) error {

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ type CRIService interface {`
`45`	`45`
`46`	`46`	`// TODO: we should implement Event backoff in Controller.`
`47`	`47`	`BackOffEvent(id string, event interface{})`
`48`		`-`
`49`		`- // TODO: refactor event generator for PLEG.`
`50`		`- // GenerateAndSendContainerEvent is called by controller for sandbox container events.`
`51`		`- GenerateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType)`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`type Controller struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"fmt"`
`22`	`22`
`23`		`- runtime "k8s.io/cri-api/pkg/apis/runtime/v1"`
`24`		`-`
`25`	`23`	`"github.com/containerd/containerd"`
`26`	`24`	`"github.com/containerd/containerd/errdefs"`
`27`	`25`	`"github.com/containerd/containerd/log"`
`@@ -59,10 +57,5 @@ func (c *Controller) Shutdown(ctx context.Context, sandboxID string) error {`
`59`	`57`	`}`
`60`	`58`	`}`
`61`	`59`
`62`		`- // Send CONTAINER_DELETED event with ContainerId equal to SandboxId.`
`63`		`- c.cri.GenerateAndSendContainerEvent(ctx, sandboxID, sandboxID, runtime.ContainerEventType_CONTAINER_DELETED_EVENT)`
`64`		`-`
`65`		`- c.sandboxStore.Delete(sandboxID)`
`66`		`-`
`67`	`60`	`return nil`
`68`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ func (c criService) RemovePodSandbox(ctx context.Context, r runtime.RemovePodS`
`90`	`90`	`return nil, fmt.Errorf("failed to delete sandbox %q: %w", id, err)`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ // Send CONTAINER_DELETED event with ContainerId equal to SandboxId.`
	`94`	`+ c.generateAndSendContainerEvent(ctx, id, id, runtime.ContainerEventType_CONTAINER_DELETED_EVENT)`
	`95`	`+`
`93`	`96`	`err = c.nri.RemovePodSandbox(ctx, &sandbox)`
`94`	`97`	`if err != nil {`
`95`	`98`	`log.G(ctx).WithError(err).Errorf("NRI pod removal notification failed")`