Skip to content

Bug 1749557: Provide context when obtaining image signatures #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Bug 1749557: Provide context when obtaining image signatures #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkg/image/controller/signature/container_image_downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ func (s *containerImageSignatureDownloader) DownloadImageSignatures(image *image
if err != nil {
return nil, err
}
source, err := reference.NewImageSource(nil, nil)

ctx, cancel := context.WithTimeout(s.ctx, s.timeout)
defer cancel()

source, err := reference.NewImageSource(ctx, nil)
if err != nil {
// In case we fail to talk to registry to get the image metadata (private
// registry, internal registry, etc...), do not fail with error to avoid
Expand All @@ -46,9 +50,6 @@ func (s *containerImageSignatureDownloader) DownloadImageSignatures(image *image
}
defer source.Close()

ctx, cancel := context.WithTimeout(s.ctx, s.timeout)
defer cancel()

signatures, err := source.GetSignatures(ctx, nil)
if err != nil {
klog.V(4).Infof("Failed to get signatures for %v due to: %v", source.Reference(), err)
Expand Down