🌱 consolidate Release types with operator-registry by rashmigottipati · Pull Request #2771 · operator-framework/operator-controller

rashmigottipati · 2026-06-16T23:50:12Z

Description

Removes duplicate bundle.Release and bundle.VersionRelease type definitions in favor of using declcfg.Release and declcfg.VersionRelease from operator-registry.

This consolidates type definitions between operator-controller and operator-registry, eliminating code duplication and aligning with the vision from OPRUN-4548.

Changes:

Delete internal/operator-controller/bundle/versionrelease.go and the test file
Update all internal code to use declcfg.VersionRelease and declcfg.Release from operator-registry
API boundary (BundleMetadata.Release) remains *string with conversion at:
- bundleutil.MetadataFor (declcfg -> API)
- catalogmetadata/filter.parseInstalledBundleVersionRelease (API -> declcfg)

Reviewer Checklist

API Go Documentation
Tests: Unit Tests (and E2E Tests, if appropriate)
Comprehensive Commit Messages
Links to related GitHub Issue(s)

netlify · 2026-06-16T23:50:17Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`74c294c`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/6a3eae50e78cc90008fc2090
😎 Deploy Preview	https://deploy-preview-2771--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
🤖 Make changes	Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

openshift-ci · 2026-06-16T23:50:18Z

[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 tmshort for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

Copilot

Pull request overview

This PR removes operator-controller’s duplicate bundle.Release / bundle.VersionRelease definitions and standardizes on declcfg.Release / declcfg.VersionRelease from operator-registry, keeping the API boundary (BundleMetadata.Release as *string) intact via conversion helpers.

Changes:

Replaced internal bundle.VersionRelease usage across resolver, catalogmetadata filtering/comparison, and tests with declcfg.VersionRelease.
Moved legacy registry+v1 “release-in-build-metadata” parsing logic into package-local helpers where needed, and updated metadata conversion (bundleutil.MetadataFor) accordingly.
Removed the now-redundant internal/operator-controller/bundle/versionrelease.go and its unit tests; updated generated CRD artifacts touched by regeneration.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
manifests/experimental.yaml	Updates generated experimental manifests (includes CRD generator version annotation change for ClusterExtension CRD).
manifests/experimental-e2e.yaml	Updates generated experimental e2e manifests (includes CRD generator version annotation change for ClusterExtension CRD).
internal/operator-controller/resolve/resolver.go	Changes resolver interface to return `*declcfg.VersionRelease` instead of the internal type.
internal/operator-controller/resolve/catalog.go	Propagates `declcfg.VersionRelease` through catalog resolution return types.
internal/operator-controller/resolve/catalog_test.go	Updates resolver unit tests to assert against `declcfg.VersionRelease`.
internal/operator-controller/controllers/clusterextension_controller_test.go	Updates controller tests to use `declcfg.VersionRelease` in mocked resolver responses.
internal/operator-controller/catalogmetadata/filter/successors.go	Converts installed bundle metadata parsing to produce `*declcfg.VersionRelease`, including legacy registry+v1 parsing helper.
internal/operator-controller/catalogmetadata/filter/successors_test.go	Adjusts successor/filter tests to use `declcfg.VersionRelease` parsing helper.
internal/operator-controller/catalogmetadata/filter/bundle_predicates.go	Updates version/release predicate API to take `declcfg.VersionRelease` and compare via declcfg’s Compare semantics.
internal/operator-controller/catalogmetadata/compare/compare.go	Updates bundle version/release comparison to use `declcfg.VersionRelease`.
internal/operator-controller/bundleutil/bundle.go	Updates bundle property parsing and `MetadataFor` conversion to use `declcfg.Release` / `declcfg.VersionRelease` and new legacy parsing/conversion helpers.
internal/operator-controller/bundleutil/bundle_test.go	Updates bundleutil tests for `declcfg.VersionRelease` expectations.
internal/operator-controller/bundle/versionrelease.go	Deletes the duplicated internal release/version types and logic.
internal/operator-controller/bundle/versionrelease_test.go	Deletes unit tests for the removed internal release/version types.
helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml	Updates generated Helm base CRD for ClusterExtension (includes generator version annotation change).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

codecov · 2026-06-17T00:16:48Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.31%. Comparing base (cf0266c) to head (74c294c).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2771      +/-   ##
==========================================
- Coverage   70.42%   70.31%   -0.12%     
==========================================
  Files         143      142       -1     
  Lines       10625    10577      -48     
==========================================
- Hits         7483     7437      -46     
+ Misses       2580     2579       -1     
+ Partials      562      561       -1

Flag	Coverage Δ
e2e	`35.14% <60.46%> (+<0.01%)`	⬆️
experimental-e2e	`52.59% <39.53%> (+0.30%)`	⬆️
unit	`59.32% <100.00%> (-0.19%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 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.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

tmshort

Most of this is changing the namespace of an API, but there is some de-duplication that could be done.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated no new comments.

perdasilva

Code Review: Consolidate Release types with operator-registry

4 inline comments posted + 3 additional findings below.

Double JSON unmarshal in `parseVersionRelease` (`bundleutil/bundle.go:66-76`)

pkgData is unmarshalled twice: once into property.Package (line 66) and again into a helper struct (line 76) just to detect Release *string presence. Only pkg.Version is actually used from property.Package. A single struct struct{ Version string \json:"version"`; Release *string `json:"release"` }` would serve both purposes in one unmarshal pass.

`SuccessorsOf` double-parses installed bundle version (`successors.go:57-75`)

parseInstalledBundleVersionRelease (line 57) parses installedBundle.Version into a bsemver.Version, then legacySuccessor (line 75) parses the exact same string again via bsemver.Parse. The already-parsed version could be passed to legacySuccessor instead.

33 comparison test cases deleted without equivalent upstream coverage

The deleted bundle/versionrelease_test.go contained TestRelease_Compare (17 cases) and TestVersionRelease_Compare (16 cases). operator-registry v1.72.0's versionrelease_test.go has zero dedicated Compare tests — only a single equality assertion inside a round-trip test. ParseLegacyVersionRelease also has no direct unit tests (only indirect coverage through GetVersionAndRelease). Consider either adding comparison tests upstream or keeping a subset here.

perdasilva · 2026-06-26T12:04:10Z

 	}

-	var release bundle.Release
+	var release declcfg.Release


This block (lines 33-51) is a semantic duplicate of parseExplicitRelease in bundleutil/bundle.go (lines 99-120): both parse version, branch on empty-vs-nonempty release, construct VersionRelease.

Consider exporting parseExplicitRelease as ParseExplicitRelease and calling it from here to avoid drift if either copy changes.

done - exported parseExplicitRelease as ParseExplicitRelease and called it from parseInstalledBundleVersionRelease to eliminate the duplication. Fixed in latest commit

perdasilva · 2026-06-26T12:04:10Z

+		Build: vr.Version.Build,
+	}
+	if len(vr.Release) > 0 {
+		v.Build = make([]string, len(vr.Release))


nit: This manual loop duplicates the slicesutil.Map pattern already used in compare/compare.go:35 for the identical PRVersion→string conversion. The old deleted code also used slicesutil.Map here.

fixed - replaced the manual loop with slicesutil.Map. addressed in latest commit.

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

- Export parseExplicitRelease as ParseExplicitRelease and use it from parseInstalledBundleVersionRelease to deduplicate logic - Replace manual loop with slicesutil.Map in asLegacyRegistryV1Version - Update test error message expectation Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

Copilot AI review requested due to automatic review settings June 16, 2026 23:50

openshift-ci Bot requested review from ankitathomas and perdasilva June 16, 2026 23:50

Copilot started reviewing on behalf of rashmigottipati June 16, 2026 23:50 View session

Copilot AI reviewed Jun 16, 2026

View reviewed changes

rashmigottipati force-pushed the consolidate-release-type branch 2 times, most recently from 2865724 to ccc8f3b Compare June 17, 2026 13:21

Copilot AI review requested due to automatic review settings June 17, 2026 13:21

Copilot started reviewing on behalf of rashmigottipati June 17, 2026 13:21 View session

Copilot AI reviewed Jun 17, 2026

View reviewed changes

Comment thread internal/operator-controller/catalogmetadata/filter/successors.go Outdated

tmshort reviewed Jun 18, 2026

View reviewed changes

Comment thread internal/operator-controller/bundleutil/bundle.go Outdated

Comment thread internal/operator-controller/catalogmetadata/compare/compare.go

pedjak reviewed Jun 18, 2026

View reviewed changes

Comment thread internal/operator-controller/catalogmetadata/filter/successors.go Outdated

grokspawn reviewed Jun 23, 2026

View reviewed changes

Comment thread internal/operator-controller/bundleutil/bundle.go Outdated

grokspawn reviewed Jun 23, 2026

View reviewed changes

Comment thread internal/operator-controller/catalogmetadata/filter/successors.go Outdated

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2026

Copilot AI review requested due to automatic review settings June 24, 2026 03:28

rashmigottipati force-pushed the consolidate-release-type branch from ac0cad4 to e0fe939 Compare June 24, 2026 03:28

openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2026

Copilot started reviewing on behalf of rashmigottipati June 24, 2026 03:29 View session

rashmigottipati force-pushed the consolidate-release-type branch from e0fe939 to da8ab9c Compare June 24, 2026 03:31

Copilot AI reviewed Jun 24, 2026

View reviewed changes

Comment thread internal/operator-controller/controllers/clusterextension_controller_test.go

Comment thread internal/operator-controller/bundleutil/bundle.go

rashmigottipati force-pushed the consolidate-release-type branch from da8ab9c to 21e1ef3 Compare June 24, 2026 03:34

Copilot AI review requested due to automatic review settings June 24, 2026 03:34

Copilot started reviewing on behalf of rashmigottipati June 24, 2026 03:34 View session

Copilot AI reviewed Jun 24, 2026

View reviewed changes

Comment thread internal/operator-controller/bundleutil/bundle.go

rashmigottipati requested review from pedjak and tmshort June 24, 2026 03:51

rashmigottipati requested a review from grokspawn June 24, 2026 03:51

perdasilva reviewed Jun 24, 2026

View reviewed changes

Comment thread internal/operator-controller/bundleutil/bundle.go

Copilot AI review requested due to automatic review settings June 24, 2026 09:00

perdasilva force-pushed the consolidate-release-type branch from 518364a to 21e1ef3 Compare June 24, 2026 09:00

Copilot started reviewing on behalf of perdasilva June 24, 2026 09:01 View session

Copilot AI reviewed Jun 24, 2026

View reviewed changes

rashmigottipati requested a review from perdasilva June 25, 2026 16:16

perdasilva reviewed Jun 26, 2026

View reviewed changes

rashmigottipati added 3 commits June 26, 2026 12:52

Consolidate Release types with operator-registry

fe3c984

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

address review comments

e387b3a

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

rashmigottipati force-pushed the consolidate-release-type branch from 21e1ef3 to 74c294c Compare June 26, 2026 16:52

rashmigottipati requested a review from perdasilva June 26, 2026 16:53

Uh oh!

Conversation

rashmigottipati commented Jun 16, 2026

Description

Reviewer Checklist

Uh oh!

netlify Bot commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for olmv1 ready!

Uh oh!

openshift-ci Bot commented Jun 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Jun 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

tmshort left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

perdasilva left a comment

Choose a reason for hiding this comment

Code Review: Consolidate Release types with operator-registry

Double JSON unmarshal in parseVersionRelease (bundleutil/bundle.go:66-76)

SuccessorsOf double-parses installed bundle version (successors.go:57-75)

33 comparison test cases deleted without equivalent upstream coverage

Uh oh!

Uh oh!

Uh oh!

perdasilva Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

rashmigottipati Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

perdasilva Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

rashmigottipati Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

netlify Bot commented Jun 16, 2026 •

edited

Loading

codecov Bot commented Jun 17, 2026 •

edited

Loading

Double JSON unmarshal in `parseVersionRelease` (`bundleutil/bundle.go:66-76`)

`SuccessorsOf` double-parses installed bundle version (`successors.go:57-75`)