From e970686d67859514bde103379a062e7cbf71fe1f Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 9 Jul 2024 09:06:30 +0200 Subject: [PATCH] Make `crictl events` interruptable We now utilize the new CRI API to make the events method interruptable by the context. Signed-off-by: Sascha Grunert --- cmd/crictl/events.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/crictl/events.go b/cmd/crictl/events.go index 3c333e2643..644a716b37 100644 --- a/cmd/crictl/events.go +++ b/cmd/crictl/events.go @@ -81,7 +81,9 @@ func Events(cliContext *cli.Context, client internalapi.RuntimeService) error { containerEventsCh := make(chan *pb.ContainerEventResponse) go func() { logrus.Debug("getting container events") - err := client.GetContainerEvents(context.Background(), containerEventsCh, nil) + _, err := InterruptableRPC(nil, func(ctx context.Context) (any, error) { + return nil, client.GetContainerEvents(ctx, containerEventsCh, nil) + }) if err == io.EOF { errCh <- nil return