feat: Migrate from manifest v0 to v1 format by olivergondza · Pull Request #1239 · redhat-developer/gitops-operator

olivergondza · 2026-07-28T11:01:31Z

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind bug
/kind cleanup
/kind failing-test
/kind enhancement
/kind documentation
/kind code-refactoring

What does this PR do / why we need it:

Avoid using the OLMv1 and move towards OLMv2.

Co-authored-by: Cursor

Have you updated the necessary documentation?

Documentation update is required by this PR.
Documentation has been updated.

Which issue(s) this PR fixes:

https://redhat.atlassian.net/browse/GITOPS-10517
https://redhat.atlassian.net/browse/GITOPS-10516

Test acceptance criteria:

Unit Test
E2E Test

How to test changes / Special notes to the reviewer:

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

openshift-ci · 2026-07-28T11:01:46Z

[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 varshab1210 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

coderabbitai · 2026-07-28T11:02:00Z

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

@coderabbitai resume to resume automatic reviews.
@coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

▶️ Resume reviews
🔍 Trigger review

📝 Walkthrough

Summary by CodeRabbit

New Features
- Updated bundle and catalog packaging to support modern Operator Framework formats.
- Added validation for bundles and catalogs during builds.
- Added checks to prevent deprecated catalog formats and metadata from being published.
- Standardized the bundle package and channel configuration.
Chores
- Excluded generated catalog artifacts from version control.
- Removed obsolete container packaging configuration.

Walkthrough

The build now validates OLM v1 bundles, constructs file-based catalogs with OPM v1.72.0, rejects deprecated catalog formats, updates bundle metadata and channels, removes the plugin container image, and ignores generated catalog artifacts.

Changes

OLM v1 build and catalog migration

Layer / File(s)	Summary
Bundle v1 validation and labeling `Makefile`, `Containerfile.plugin`, `bundle.Dockerfile`, `bundle/bundle.Dockerfile`	Bundle targets validate OLM v1 schemas and media types. Bundle metadata uses current labels and paths. The plugin container image is removed.
File-based catalog build `Makefile`, `.gitignore`	Catalog generation uses OPM v1.72.0 and a file-based catalog workflow. Validation rejects legacy bundle objects and SQLite indexes. Generated catalog files are ignored.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Makefile
  participant opm
  participant CONTAINER_RUNTIME
  Makefile->>opm: Initialize and render file-based catalog
  Makefile->>opm: Validate catalog and generate Dockerfile
  Makefile->>CONTAINER_RUNTIME: Build CATALOG_IMG
  Makefile->>CONTAINER_RUNTIME: Push CATALOG_IMG
  Makefile->>CONTAINER_RUNTIME: Inspect catalog image

Suggested reviewers: jannfis, jgwest

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly identifies the main change: migrating from manifest v0 to v1 format.
Description check	✅ Passed	The description states that the PR moves away from OLMv1 toward OLMv2, which matches the catalog and bundle migration changes.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{Comment @coderabbitai help to get the list of available commands.}

coderabbitai

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Makefile`:
- Line 280: Update the image inspection check in the Makefile to grep for the
operators.operatorframework.io.bundle.mediatype.v1 label and assert its
registry+v1 value, replacing the current test.mediatype.v1 check so the gate
validates the bundle media type.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 06dee4f6-c341-4b6c-a565-ce25118ff839

📥 Commits

Reviewing files that changed from the base of the PR and between 4d7b223 and 0f85af1.

📒 Files selected for processing (4)

.gitignore
Containerfile.plugin
Makefile
bundle/bundle.Dockerfile

🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

argoproj-labs/argocd-operator (manual)

💤 Files with no reviewable changes (1)

bundle/bundle.Dockerfile

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza · 2026-07-28T12:37:43Z

/retest

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza · 2026-07-28T20:29:56Z

/retest

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza · 2026-07-29T07:15:57Z

@svghadi, @jgwest, can you please take a look?

This is a first step in the above Epic, addressing what I consider are the most pressing aspects before the OLMv0 deprecation.

svghadi

I have a question regarding backward compatibility. Can the new bundle and catalog images containing OLM v1 changes be used to install the operator on OLM v0 clusters, or do we need to publish separate images for OLM v0 and OLM v1?

svghadi · 2026-07-31T05:12:04Z

 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=openshift-gitops-operator


We should preserve this name. In downstream we use openshift-gitops-operator
https://github.com/rh-gitops-midstream/release/blob/1e290203760532335b3d5bfcfc3919ee92a678ad/containers/gitops-operator-bundle/Dockerfile#L7

Based on your comment, I tried to get it aligned with production build, but the prefix makes the computed name+version too long for the 33-ish character limit, that was surprisingly hard to workaround.

The make olm-deploy and the manual procedure we had before, was using the other "bundle.Dockerfile" with gitops-operator as a package name. So this does not change how the developers deploy the operator. I suggest keeping this as is, because a) it worked this way for years, and b) it is not used for other purposed than temporary deploying during development.

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

coderabbitai

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@bundle.Dockerfile`:
- Line 8: Align the bundle channel metadata across the Docker label,
bundle/metadata/annotations.yaml, and the Makefile CHANNELS input: either
consistently retain both latest and gitops-1.8 or consistently remove gitops-1.8
from all three sources. Ensure generated bundle metadata and catalog validation
use the same channel set.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: db3eeb74-ba64-4afb-8f51-5c4ead962eed

📥 Commits

Reviewing files that changed from the base of the PR and between 14c1a25 and dac9f1f.

📒 Files selected for processing (4)

Containerfile.plugin
Makefile
bundle.Dockerfile
bundle/bundle.Dockerfile

🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

argoproj-labs/argocd-operator (manual)

💤 Files with no reviewable changes (1)

Containerfile.plugin

🚧 Files skipped from review as they are similar to previous changes (2)

bundle/bundle.Dockerfile
Makefile

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

…into bump-opm Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza · 2026-08-12T08:43:35Z

I have a question regarding backward compatibility. Can the new bundle and catalog images containing OLM v1 changes be used to install the operator on OLM v0 clusters, or do we need to publish separate images for OLM v0 and OLM v1?

As discussed offline, OCP 4.18 is the first release where OLMv1 is GA. So there will be problems installing this on older ones, where OLMv1 is a Tech Preview. However, latest gitops-operators depends on 4.18+, so there is no need to support both OLM versions, provided we do not backport this change.

This reverts commit 435aa84. Signed-off-by: Oliver Gondža <ogondza@gmail.com>

…into bump-opm Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza · 2026-08-14T18:29:38Z

/retest

olivergondza · 2026-08-15T06:31:06Z

/test v4.19-kuttl-sequential

olivergondza · 2026-08-15T09:33:31Z

/test v4.14-kuttl-sequential

olivergondza · 2026-08-17T12:22:30Z

@svghadi, can you please take a look?

olivergondza · 2026-08-18T14:35:42Z

/test v4.14-kuttl-sequential

olivergondza added 2 commits July 28, 2026 12:58

Migrate from manifest v0 to v1 format

c7f56f6

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

feat: Drop obsolete delivery mode (com.redhat.delivery)

0f85af1

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

openshift-ci Bot added the kind/enhancement New feature or request label Jul 28, 2026

openshift-ci Bot requested review from jannfis and jgwest July 28, 2026 11:01

coderabbitai Bot reviewed Jul 28, 2026

View reviewed changes

Comment thread Makefile Outdated

More thorough check for v1 manifest format

12f8cf9

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Move the bundle Dockerfile path where openshift-ci expects it

fb01b2f

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza force-pushed the bump-opm branch from b084ddf to fb01b2f Compare July 28, 2026 13:12

olivergondza added 2 commits July 28, 2026 15:32

Sync the bundle/bundle.Dockerfile, plan its removal

0ce5f6a

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Convert catalog index from olm.bundle.object to olm.csv.metadata

14c1a25

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Refactor Makefile changes

bc5ee89

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

svghadi reviewed Jul 31, 2026

View reviewed changes

chore: Drop unused Containerfile.plugin

71449f8

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

coderabbitai Bot reviewed Jul 31, 2026

View reviewed changes

Comment thread bundle.Dockerfile Outdated

chore: Drop unused old channel reference

435aa84

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

olivergondza force-pushed the bump-opm branch from dac9f1f to 435aa84 Compare July 31, 2026 11:11

openshift-ci Bot added the needs-rebase label Jul 31, 2026

Merge branch 'master' of github.com:redhat-developer/gitops-operator …

faf20ba

…into bump-opm Signed-off-by: Oliver Gondža <ogondza@gmail.com>

openshift-ci Bot added needs-rebase and removed needs-rebase labels Jul 31, 2026

olivergondza added the do-not-merge/work-in-progress label Aug 10, 2026

olivergondza added 2 commits August 14, 2026 16:33

Revert "chore: Drop unused old channel reference"

19f3852

This reverts commit 435aa84. Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Merge branch 'master' of github.com:redhat-developer/gitops-operator …

8c20115

…into bump-opm Signed-off-by: Oliver Gondža <ogondza@gmail.com>

openshift-ci Bot removed the needs-rebase label Aug 14, 2026

Uh oh!

Conversation

olivergondza commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Jul 28, 2026

Uh oh!

coderabbitai Bot commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviews paused

Summary by CodeRabbit

Walkthrough

Changes

Sequence Diagram(s)

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

olivergondza commented Jul 28, 2026

Uh oh!

olivergondza commented Jul 28, 2026

Uh oh!

olivergondza commented Jul 29, 2026

Uh oh!

svghadi left a comment

Choose a reason for hiding this comment

Uh oh!

svghadi Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

olivergondza Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

olivergondza commented Aug 12, 2026

Uh oh!

olivergondza commented Aug 14, 2026

Uh oh!

olivergondza commented Aug 15, 2026

Uh oh!

olivergondza commented Aug 15, 2026

Uh oh!

olivergondza commented Aug 17, 2026

Uh oh!

olivergondza commented Aug 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

olivergondza commented Jul 28, 2026 •

edited

Loading

coderabbitai Bot commented Jul 28, 2026 •

edited

Loading