Skip to content

Commit 67cc870

Browse files
rashmigottipatiperdasilva
authored andcommitted
OPECO-2646: exclude bundles with olm.deprecated property when rendering (#1063)
* exclude bundles with `olm.deprecated` property when rendering Signed-off-by: Rashmi Gottipati <[email protected]> * Exclude bundles based on the property type and not value Signed-off-by: Rashmi Gottipati <[email protected]> --------- Signed-off-by: Rashmi Gottipati <[email protected]> Upstream-repository: operator-registry Upstream-commit: 0aeffa3f44f5e36bd2c0bcc63a94eda000a5f257
1 parent d421904 commit 67cc870

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

staging/operator-registry/pkg/sqlite/conversion.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ func populateModelChannels(ctx context.Context, pkgs model.Model, q *SQLQuerier)
7676
if err != nil {
7777
return err
7878
}
79+
80+
ConvertBundles:
7981
for _, bundle := range bundles {
82+
for _, prop := range bundle.Properties {
83+
if prop.Type == registry.DeprecatedType {
84+
// bundle contains `olm.Deprecated` property
85+
// exclude this bundle from being rendered
86+
continue ConvertBundles
87+
}
88+
}
8089
pkg, ok := pkgs[bundle.PackageName]
8190
if !ok {
8291
return fmt.Errorf("unknown package %q for bundle %q", bundle.PackageName, bundle.CsvName)

vendor/github.com/operator-framework/operator-registry/pkg/lib/indexer/index.Dockerfile294678580

Whitespace-only changes.

vendor/github.com/operator-framework/operator-registry/pkg/lib/indexer/index.Dockerfile3566856741

Whitespace-only changes.

vendor/github.com/operator-framework/operator-registry/pkg/sqlite/conversion.go

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

0 commit comments

Comments
 (0)