Skip to content

OCPBUGS-77404: bugfix: use a system context for setting custom auth file path when fetching image sources #447

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

Open
everettraven wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Open

OCPBUGS-77404: bugfix: use a system context for setting custom auth file path when fetching image sources #447

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
19 changes: 13 additions & 6 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 @@ -4,9 +4,11 @@ import (
"context"
"crypto/sha256"
"fmt"
"os"
"time"

"github.com/containers/image/v5/docker"
"github.com/containers/image/v5/types"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"
Expand All @@ -15,15 +17,21 @@ import (
"github.com/openshift/library-go/pkg/image/imageutil"
)

const registryAuthFileEnvVar = "REGISTRY_AUTH_FILE"

type containerImageSignatureDownloader struct {
ctx context.Context
timeout time.Duration
ctx context.Context
timeout time.Duration
systemContext *types.SystemContext
}

func NewContainerImageSignatureDownloader(ctx context.Context, timeout time.Duration) SignatureDownloader {
return &containerImageSignatureDownloader{
ctx: ctx,
timeout: timeout,
systemContext: &types.SystemContext{
AuthFilePath: os.Getenv("REGISTRY_AUTH_FILE"),
},
}
}

Expand All @@ -40,11 +48,10 @@ func (s *containerImageSignatureDownloader) DownloadImageSignatures(image *image
ctx, cancel := context.WithTimeout(s.ctx, s.timeout)
defer cancel()

source, err := reference.NewImageSource(ctx, nil)
source, err := reference.NewImageSource(ctx, s.systemContext)
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
// spamming logs.
// In case we fail to talk to registry to get the image metadata
// do not fail with error to avoid spamming logs.
klog.V(4).Infof("Failed to get %q: %v", image.DockerImageReference, err)
return []imagev1.ImageSignature{}, nil
}
Expand Down