Skip to content

Commit a7d5ca1

Browse files
committed
fixing reliance on candidate channel containing all referenced bundles (#1009)
Signed-off-by: Jordan Keister <[email protected]> Upstream-commit: 52e35f0291529290363e0e2d23d5b0c1524103c1 Upstream-repository: operator-registry
1 parent fceaf8a commit a7d5ca1

File tree

2 files changed

+32
-4
lines changed
  • staging/operator-registry/alpha/veneer/semver
  • vendor/github.com/operator-framework/operator-registry/alpha/veneer/semver

2 files changed

+32
-4
lines changed

staging/operator-registry/alpha/veneer/semver/semver.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,16 @@ func (v Veneer) Render(ctx context.Context) (*declcfg.DeclarativeConfig, error)
8484
}
8585

8686
var cfgs []declcfg.DeclarativeConfig
87-
for _, b := range sv.Candidate.Bundles {
87+
88+
bundleDict := make(map[string]struct{})
89+
buildBundleList(&sv.Candidate.Bundles, &bundleDict)
90+
buildBundleList(&sv.Fast.Bundles, &bundleDict)
91+
buildBundleList(&sv.Stable.Bundles, &bundleDict)
92+
93+
for b, _ := range bundleDict {
8894
r := action.Render{
8995
AllowedRefMask: action.RefBundleImage,
90-
Refs: []string{b.Image},
96+
Refs: []string{b},
9197
Registry: v.Registry,
9298
}
9399
c, err := r.Run(ctx)
@@ -114,6 +120,14 @@ func (v Veneer) Render(ctx context.Context) (*declcfg.DeclarativeConfig, error)
114120
return &out, nil
115121
}
116122

123+
func buildBundleList(bundles *[]semverVeneerBundleEntry, dict *map[string]struct{}) {
124+
for _, b := range *bundles {
125+
if _, ok := (*dict)[b.Image]; !ok {
126+
(*dict)[b.Image] = struct{}{}
127+
}
128+
}
129+
}
130+
117131
func readFile(data io.Reader) (*semverVeneer, error) {
118132
fileData, err := io.ReadAll(data)
119133
if err != nil {

vendor/github.com/operator-framework/operator-registry/alpha/veneer/semver/semver.go

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)