Post cherry-pick fixes

mxpv · mxpv · commit e21c8beee6c0 · 2023-05-31T11:46:12.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/pkg/cri/sbserver/events.go b/pkg/cri/sbserver/events.go
@@ -332,7 +332,7 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
 		}
 		return nil
 	case *eventtypes.SandboxExit:
-		log.L.Infof("SandboxExit event %+v", e)
+		logrus.Infof("SandboxExit event %+v", e)
 		sb, err := em.c.sandboxStore.Get(e.GetSandboxID())
 		if err == nil {
 			if err := handleSandboxExit(ctx, sb, e.ExitStatus, e.ExitedAt.AsTime(), em.c); err != nil {
diff --git a/pkg/cri/sbserver/service.go b/pkg/cri/sbserver/service.go
@@ -17,7 +17,6 @@
 package sbserver
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func (em *eventMonitor) handleEvent(any interface{}) error {`
`332`	`332`	`}`
`333`	`333`	`return nil`
`334`	`334`	`case *eventtypes.SandboxExit:`
`335`		`- log.L.Infof("SandboxExit event %+v", e)`
	`335`	`+ logrus.Infof("SandboxExit event %+v", e)`
`336`	`336`	`sb, err := em.c.sandboxStore.Get(e.GetSandboxID())`
`337`	`337`	`if err == nil {`
`338`	`338`	`if err := handleSandboxExit(ctx, sb, e.ExitStatus, e.ExitedAt.AsTime(), em.c); err != nil {`