Skip to content

Commit 78d6d7d

Browse files
committed
image: fix signature import from secure registries
1 parent 64bad7b commit 78d6d7d

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

pkg/image/controller/signature/container_image_downloader.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"time"
88

99
"github.com/containers/image/docker"
10+
"github.com/containers/image/types"
11+
"github.com/golang/glog"
1012

1113
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1214

@@ -30,9 +32,19 @@ func (s *containerImageSignatureDownloader) DownloadImageSignatures(image *image
3032
if err != nil {
3133
return nil, err
3234
}
33-
source, err := reference.NewImageSource(nil, nil)
35+
// TODO: We just need to trick ping() to pass and not error, we don't care
36+
// whether the registry is secure or not at this point as GetSignatures() use
37+
// different client for signature retrieval?
38+
sctx := types.SystemContext{
39+
DockerInsecureSkipTLSVerify: true,
40+
}
41+
source, err := reference.NewImageSource(&sctx, nil)
3442
if err != nil {
35-
return nil, err
43+
// In case we fail to talk to registry to get the image metadata (private
44+
// registry, internal registry, etc...), do not fail with error to avoid
45+
// spamming logs.
46+
glog.V(4).Infof("Failed to get %q: %v", image.DockerImageReference, err)
47+
return []imageapi.ImageSignature{}, nil
3648
}
3749
defer source.Close()
3850

0 commit comments

Comments
 (0)