kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updates around VNFS restructure and kernel restructure. More coming.

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-05 16:43:30 -08:00
parent 4efb27a82f
commit 0095b55624
28 changed files with 791 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/oci/cache.go
View File

@@ -79,15 +79,15 @@ func NewCache(opts ...CacheOpt) (*Cache, error) {
}
func (c *Cache) Pull(ctx context.Context, uri string, sysCtx *types.SystemContext) (string, error) {
p, err := newPuller(
optSetBlobCachePath(c.blobDir()),
optSetSystemContext(sysCtx),
p, err := NewPuller(
OptSetBlobCachePath(c.blobDir()),
OptSetSystemContext(sysCtx),
)
if err != nil {
return "", err
}
id, err := p.generateID(ctx, uri)
id, err := p.GenerateID(ctx, uri)
if err != nil {
return "", err
}
@@ -107,7 +107,7 @@ func (c *Cache) Pull(ctx context.Context, uri string, sysCtx *types.SystemContex
}
// populate entry
if err := p.pull(ctx, uri, path); err != nil {
if err := p.Pull(ctx, uri, path); err != nil {
// clean up entry on error
os.RemoveAll(path)
return "", err

16
internal/pkg/oci/puller.go
View File

@@ -23,21 +23,21 @@ import (
type pullerOpt func(*puller) error
func optSetBlobCachePath(path string) pullerOpt {
func OptSetBlobCachePath(path string) pullerOpt {
return func(p *puller) error {
p.blobCachePath = path
return nil
}
}
func optSetTmpDirPath(path string) pullerOpt {
func OptSetTmpDirPath(path string) pullerOpt {
return func(p *puller) error {
p.tmpDirPath = path
return nil
}
}
func optSetSystemContext(s *types.SystemContext) pullerOpt {
func OptSetSystemContext(s *types.SystemContext) pullerOpt {
return func(p *puller) error {
p.sysCtx = s
return nil
@@ -51,7 +51,7 @@ type puller struct {
sysCtx *types.SystemContext
}
func newPuller(opts ...pullerOpt) (*puller, error) {
func NewPuller(opts ...pullerOpt) (*puller, error) {
p := &puller{
// default to a sensible value, but caller should set this with opts
blobCachePath: filepath.Join(defaultCachePath, blobPrefix),
@@ -93,8 +93,8 @@ func getReference(uri string) (types.ImageReference, error) {
}
}
// generateID stores and returns a unique identifier derived from the sha256sum of the image manifest
func (p *puller) generateID(ctx context.Context, uri string) (string, error) {
// GenerateID stores and returns a unique identifier derived from the sha256sum of the image manifest
func (p *puller) GenerateID(ctx context.Context, uri string) (string, error) {
ref, err := getReference(uri)
if err != nil {
return "", fmt.Errorf("unable to parse uri: %v", err)
@@ -114,7 +114,7 @@ func (p *puller) generateID(ctx context.Context, uri string) (string, error) {
return p.id, nil
}
func (p *puller) pull(ctx context.Context, uri, dst string) (err error) {
func (p *puller) Pull(ctx context.Context, uri, dst string) (err error) {
srcRef, err := getReference(uri)
if err != nil {
return fmt.Errorf("unable to parse uri: %v", err)
@@ -135,7 +135,7 @@ func (p *puller) pull(ctx context.Context, uri, dst string) (err error) {
// copy to cache location
_, err = copy.Image(ctx, policyCtx, cacheRef, srcRef, &copy.Options{
ReportWriter: os.Stdout,
SourceCtx: p.sysCtx,
SourceCtx: p.sysCtx,
})
if err != nil {
return err