-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
poc: direct bundle install API + implementation
Signed-off-by: Joe Lanford <[email protected]>
- Loading branch information
1 parent
6fd60b7
commit 6368ae9
Showing
11 changed files
with
198 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package resolve | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "path/filepath" | ||
|
|
||
| bsemver "github.com/blang/semver/v4" | ||
| "github.com/containers/image/v5/docker/reference" | ||
|
|
||
| "github.com/operator-framework/operator-registry/alpha/action" | ||
| "github.com/operator-framework/operator-registry/alpha/declcfg" | ||
|
|
||
| ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" | ||
| "github.com/operator-framework/operator-controller/internal/bundleutil" | ||
| "github.com/operator-framework/operator-controller/internal/rukpak/source" | ||
| ) | ||
|
|
||
| type BundleResolver struct { | ||
| Unpacker source.Unpacker | ||
| BrittleUnpackerCacheDir string | ||
| } | ||
|
|
||
| func (r *BundleResolver) Resolve(ctx context.Context, ext *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) { | ||
| res, err := r.Unpacker.Unpack(ctx, &source.BundleSource{ | ||
| Name: ext.Name, | ||
| Type: source.SourceTypeImage, | ||
| Image: &source.ImageSource{ | ||
| Ref: ext.Spec.Source.Bundle.Ref, | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return nil, nil, nil, err | ||
| } | ||
| if res.State != source.StateUnpacked { | ||
| return nil, nil, nil, fmt.Errorf("bundle not unpacked: %v", res.Message) | ||
| } | ||
|
|
||
| ref, err := reference.ParseNamed(res.ResolvedSource.Image.Ref) | ||
| if err != nil { | ||
| return nil, nil, nil, err | ||
| } | ||
| canonicalRef, ok := ref.(reference.Canonical) | ||
| if !ok { | ||
| return nil, nil, nil, errors.New("expected canonical reference") | ||
| } | ||
| bundlePath := filepath.Join(r.BrittleUnpackerCacheDir, ext.Name, canonicalRef.Digest().String()) | ||
|
|
||
| // TODO: This is a temporary workaround to get the bundle from the filesystem | ||
| // until the operator-registry library is updated to support reading from a | ||
| // filesystem. This will be removed once the library is updated. | ||
|
|
||
| render := action.Render{ | ||
| Refs: []string{bundlePath}, | ||
| AllowedRefMask: action.RefBundleDir, | ||
| } | ||
| fbc, err := render.Run(ctx) | ||
| if err != nil { | ||
| return nil, nil, nil, err | ||
| } | ||
| if len(fbc.Bundles) != 1 { | ||
| return nil, nil, nil, errors.New("expected exactly one bundle") | ||
| } | ||
| bundle := fbc.Bundles[0] | ||
| bundle.Image = canonicalRef.String() | ||
| v, err := bundleutil.GetVersion(bundle) | ||
| if err != nil { | ||
| return nil, nil, nil, err | ||
| } | ||
| return &bundle, v, nil, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters