Skip to content

Commit 55fa2e2

Browse files
author
Per Goncalves da Silva
committed
patch default policy load error handling
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 64c2a99 commit 55fa2e2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

catalogd/internal/source/containers_image.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ import (
3333

3434
const ConfigDirLabel = "operators.operatorframework.io.index.configs.v1"
3535

36+
var defaultImagePullPolicy = []byte(`{"default":[{"type":"insecureAcceptAnything"}]}`)
37+
3638
type ContainersImageRegistry struct {
3739
BaseCachePath string
3840
SourceContextFunc func(logger logr.Logger) (*types.SystemContext, error)
@@ -249,9 +251,9 @@ func resolveCanonicalRef(ctx context.Context, imgRef reference.Named, imageCtx *
249251

250252
func loadPolicyContext(sourceContext *types.SystemContext, l logr.Logger) (*signature.PolicyContext, error) {
251253
policy, err := signature.DefaultPolicy(sourceContext)
252-
if os.IsNotExist(err) {
254+
if err != nil {
253255
l.Info("no default policy found, using insecure policy")
254-
policy, err = signature.NewPolicyFromBytes([]byte(`{"default":[{"type":"insecureAcceptAnything"}]}`))
256+
policy, err = signature.NewPolicyFromBytes(defaultImagePullPolicy)
255257
}
256258
if err != nil {
257259
return nil, fmt.Errorf("error loading default policy: %w", err)

0 commit comments

Comments
 (0)