Skip to content

Commit

Permalink
Update package manager revisioner to make head request
Browse files Browse the repository at this point in the history
The package revisioner only needs to acquire the the image digest to
generate a new revision name. Currently, this is done by making a GET
request, but the same functionality could be achieved with a HEAD
request, which is lighter weight and does not count as an image pull.
This updates the revisioner to use make a HEAD request.

Signed-off-by: hasheddan <[email protected]>
  • Loading branch information
hasheddan committed Oct 28, 2020
1 parent 5526ef3 commit f6aac87
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions pkg/controller/pkg/manager/revisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

const (
errFetchPackage = "failed to fetch package from remote"
errFetchPackage = "failed to fetch package digest from remote"
)

// Revisioner extracts a revision name for a package source.
Expand Down Expand Up @@ -63,15 +63,11 @@ func (r *PackageRevisioner) Revision(ctx context.Context, p v1alpha1.Package) (s
if err != nil {
return "", err
}
img, err := r.fetcher.Fetch(ctx, ref, v1alpha1.RefNames(p.GetPackagePullSecrets()))
if err != nil {
d, err := r.fetcher.Head(ctx, ref, v1alpha1.RefNames(p.GetPackagePullSecrets()))
if err != nil || d == nil {
return "", errors.Wrap(err, errFetchPackage)
}
h, err := img.Digest()
if err != nil {
return "", err
}
return xpkg.FriendlyID(p.GetName(), h.Hex), nil
return xpkg.FriendlyID(p.GetName(), d.Digest.Hex), nil
}

// NopRevisioner returns an empty revision name.
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/pkg/manager/revisioner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func TestPackageRevisioner(t *testing.T) {
reason: "Should return an error if we fail to fetch package image.",
args: args{
f: &fake.MockFetcher{
MockFetch: fake.NewMockFetchFn(nil, errBoom),
MockHead: fake.NewMockHeadFn(nil, errBoom),
},
pkg: &v1alpha1.Provider{
Spec: v1alpha1.ProviderSpec{
Expand Down

0 comments on commit f6aac87

Please sign in to comment.