Skip to content

(bug) fixing reliance on candidate channel containing all referenced bundles #1009

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

Merged
merged 1 commit into from
Aug 24, 2022
Merged

(bug) fixing reliance on candidate channel containing all referenced bundles #1009

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
18 changes: 16 additions & 2 deletions alpha/veneer/semver/semver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,16 @@ func (v Veneer) Render(ctx context.Context) (*declcfg.DeclarativeConfig, error)
}

var cfgs []declcfg.DeclarativeConfig
for _, b := range sv.Candidate.Bundles {

bundleDict := make(map[string]struct{})
buildBundleList(&sv.Candidate.Bundles, &bundleDict)
buildBundleList(&sv.Fast.Bundles, &bundleDict)
buildBundleList(&sv.Stable.Bundles, &bundleDict)

for b, _ := range bundleDict {
r := action.Render{
AllowedRefMask: action.RefBundleImage,
Refs: []string{b.Image},
Refs: []string{b},
Registry: v.Registry,
}
c, err := r.Run(ctx)
Expand All @@ -114,6 +120,14 @@ func (v Veneer) Render(ctx context.Context) (*declcfg.DeclarativeConfig, error)
return &out, nil
}

func buildBundleList(bundles *[]semverVeneerBundleEntry, dict *map[string]struct{}) {
for _, b := range *bundles {
if _, ok := (*dict)[b.Image]; !ok {
(*dict)[b.Image] = struct{}{}
}
}
}

func readFile(data io.Reader) (*semverVeneer, error) {
fileData, err := io.ReadAll(data)
if err != nil {
Expand Down