From 79198836b6ae6cef89aca7842be21afc03a96668 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Thu, 5 Sep 2019 17:32:41 -0400 Subject: [PATCH] new containers/image requires context with docker reference NewImageSource --- .../controller/signature/container_image_downloader.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/image/controller/signature/container_image_downloader.go b/pkg/image/controller/signature/container_image_downloader.go index b657dbe57..843c65226 100644 --- a/pkg/image/controller/signature/container_image_downloader.go +++ b/pkg/image/controller/signature/container_image_downloader.go @@ -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 @@ -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)