Skip to content

Commit

Permalink
Merge pull request #125841 from saschagrunert/get-container-events-ctx
Browse files Browse the repository at this point in the history
cri: allow `GetContainerEvents` to pass a context

Kubernetes-commit: b106c291c3809de9f85e032fafa789b1ef9584c9
  • Loading branch information
k8s-publishing-bot committed Jul 8, 2024
2 parents 61d3787 + 495e0ef commit a17496f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type ContainerManager interface {
// CheckpointContainer checkpoints a container
CheckpointContainer(ctx context.Context, options *runtimeapi.CheckpointContainerRequest) error
// GetContainerEvents gets container events from the CRI runtime
GetContainerEvents(containerEventsCh chan *runtimeapi.ContainerEventResponse, connectionEstablishedCallback func(runtimeapi.RuntimeService_GetContainerEventsClient)) error
GetContainerEvents(ctx context.Context, containerEventsCh chan *runtimeapi.ContainerEventResponse, connectionEstablishedCallback func(runtimeapi.RuntimeService_GetContainerEventsClient)) error
}

// PodSandboxManager contains methods for operating on PodSandboxes. The methods
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/testing/fake_runtime_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ func (r *FakeRuntimeService) CheckpointContainer(_ context.Context, options *run
return nil
}

func (f *FakeRuntimeService) GetContainerEvents(containerEventsCh chan *runtimeapi.ContainerEventResponse, connectionEstablishedCallback func(runtimeapi.RuntimeService_GetContainerEventsClient)) error {
func (f *FakeRuntimeService) GetContainerEvents(ctx context.Context, containerEventsCh chan *runtimeapi.ContainerEventResponse, connectionEstablishedCallback func(runtimeapi.RuntimeService_GetContainerEventsClient)) error {
return nil
}

Expand Down

0 comments on commit a17496f

Please sign in to comment.