Skip to content

Conversation

@grokspawn
Copy link
Contributor

@grokspawn grokspawn commented Sep 9, 2025

Description of the change:
Adds a new bundle-scoped "release" flag to the existing version property to allow for more sophisticated replacement strategies with improved transparency.
Adds a new substitutesFor catalog template to help folks trivially adopt the new approaches and avoid common error scenarios.

Motivation for the change:
As brief and RFC state, the imperative upgrade graph building process had a CSV attribute "substitutesFor" which allowed tooling to perform bundle-level replacement in resulting graphs. We had no equivalent FBC approach to the problem where there is a packaging-only change which we need to insert into an existing graph in a way that it didn't pretend to be the original bundle, but made it possible to prefer the new bundle over the old one, and even upgrade from the old to the new.

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 9, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign camilamacedo86 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@codecov
Copy link

codecov bot commented Sep 9, 2025

Codecov Report

❌ Patch coverage is 61.41304% with 71 lines in your changes missing coverage. Please review.
✅ Project coverage is 57.58%. Comparing base (24737fb) to head (63fd4b0).
⚠️ Report is 18 commits behind head on master.

Files with missing lines Patch % Lines
alpha/template/substitutes/substitutes.go 67.04% 23 Missing and 6 partials ⚠️
alpha/template/converter/converter.go 0.00% 12 Missing ⚠️
alpha/model/model.go 79.31% 6 Missing ⚠️
pkg/registry/csv.go 45.45% 5 Missing and 1 partial ⚠️
pkg/registry/parse.go 64.70% 3 Missing and 3 partials ⚠️
pkg/registry/bundle.go 55.55% 2 Missing and 2 partials ⚠️
pkg/lib/validation/bundle.go 0.00% 2 Missing and 1 partial ⚠️
pkg/registry/registry_to_model.go 40.00% 2 Missing and 1 partial ⚠️
alpha/declcfg/declcfg_to_model.go 75.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1792      +/-   ##
==========================================
+ Coverage   55.37%   57.58%   +2.21%     
==========================================
  Files         136      137       +1     
  Lines       16003    13105    -2898     
==========================================
- Hits         8861     7547    -1314     
+ Misses       5987     4387    -1600     
- Partials     1155     1171      +16     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@grokspawn grokspawn force-pushed the replaces-field branch 4 times, most recently from 64f5075 to ecf7b3a Compare October 15, 2025 21:09
@grokspawn grokspawn marked this pull request as ready for review October 17, 2025 19:13
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2025
@grokspawn
Copy link
Contributor Author

Please note that this repo's merge method is set to squash, so all of these commits will get squished to a single one even if I forget to do it manually.

They're preserved here mostly because there has been a lot of ground covered over the lifetime of this feature w.r.t. different implementation strategies, and I didn't want to lose that.

Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
Helped-by: Claude-LLM
Signed-off-by: grokspawn <jordan@nimblewidget.com>
…possible; fatal if annotation present and build metadata cannot represent release

Signed-off-by: grokspawn <jordan@nimblewidget.com>
@grokspawn grokspawn force-pushed the replaces-field branch 2 times, most recently from e63f156 to 8df7701 Compare October 31, 2025 14:41
Signed-off-by: grokspawn <jordan@nimblewidget.com>
@grokspawn
Copy link
Contributor Author

Needs to land after operator-framework/api#454 merges and a new o-f/api release is cut.
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 1, 2025
@grokspawn
Copy link
Contributor Author

grokspawn commented Dec 2, 2025

blocked by operator-framework/api#454

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants