github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128052 from saschagrunert/imagefsinfo-timeout

Browse Source 
CRI client: use default timeout for ImageFsInfo RPC
This commit is contained in:
Kubernetes Prow Robot 2024-10-14 15:16:28 +01:00 committed by GitHub
commit 7f5510921d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/cri-client/pkg/remote_image.go
View File

@ -232,9 +232,7 @@ func (r *remoteImageService) RemoveImage(ctx context.Context, image *runtimeapi.
// ImageFsInfo returns information of the filesystem that is used to store images. // ImageFsInfo returns information of the filesystem that is used to store images.
func (r *remoteImageService) ImageFsInfo(ctx context.Context) (*runtimeapi.ImageFsInfoResponse, error) { func (r *remoteImageService) ImageFsInfo(ctx context.Context) (*runtimeapi.ImageFsInfoResponse, error) {
// Do not set timeout, because `ImageFsInfo` takes time. ctx, cancel := context.WithTimeout(ctx, r.timeout)
// TODO(random-liu): Should we assume runtime should cache the result, and set timeout here?
ctx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
return r.imageFsInfoV1(ctx) return r.imageFsInfoV1(ctx)