Skip to content

Commit a9efb9e

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 a9efb9e

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

pkg/manifests/csv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: packageserver
66
namespace: openshift-operator-lifecycle-manager
77
labels:
8-
olm.version: 0.19.0
8+
olm.version: 0.0.0-862d58ed7d505d334e3b7218dee303bcafb1a212
99
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1010
annotations:
1111
include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
159159
- packageserver
160160
topologyKey: "kubernetes.io/hostname"
161161
maturity: alpha
162-
version: 0.19.0
162+
version: 0.0.0-862d58ed7d505d334e3b7218dee303bcafb1a212
163163
apiservicedefinitions:
164164
owned:
165165
- group: packages.operators.coreos.com

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/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)