✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter #2166

anik120 · 2025-08-26T15:34:21Z

Description

Put watchNamespace in config.

Work for RFC: Config -> registry+v1 bundle config

Reviewer Checklist

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

netlify · 2025-08-26T15:34:26Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`9d8f73a`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/68b7072f0e774300088f7627
😎 Deploy Preview	https://deploy-preview-2166--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

codecov · 2025-08-26T15:55:05Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.73%. Comparing base (d95f426) to head (9d8f73a).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2166      +/-   ##
==========================================
+ Coverage   72.71%   72.73%   +0.02%     
==========================================
  Files          79       79              
  Lines        7378     7384       +6     
==========================================
+ Hits         5365     5371       +6     
  Misses       1666     1666              
  Partials      347      347

Flag	Coverage Δ
e2e	`44.15% <100.00%> (+<0.01%)`	⬆️
experimental-e2e	`56.20% <100.00%> (+0.08%)`	⬆️
unit	`58.23% <100.00%> (+0.04%)`	⬆️

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

☔ 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.

internal/operator-controller/rukpak/render/render.go

internal/operator-controller/rukpak/render/render_test.go

internal/operator-controller/rukpak/render/render.go

anik120 · 2025-08-27T15:07:05Z

Carrying over a comment from slack to help other reviewers:

okay I pushed a change right now with BundleConfig converted to a discriminated union, PTAL.
And OpenAPI schema generation sounds cleaner. I kept validation in for now, but it makes sense to introduce OpenAPI schema generation and rely on that validation instead of writing custom logic

internal/operator-controller/rukpak/convert/helm.go

internal/operator-controller/applier/helm.go

internal/operator-controller/rukpak/convert/helm_test.go

internal/operator-controller/rukpak/render/render.go

internal/operator-controller/rukpak/convert/helm.go

perdasilva · 2025-09-02T14:44:56Z

internal/operator-controller/applier/helm_test.go

-				fn: func(bundle source.BundleSource, installNamespace string, watchNamespace string) (*chart.Chart, error) {
-					require.Equal(t, expectedWatchNamespace, watchNamespace)
+				fn: func(bundle source.BundleSource, installNamespace string, config map[string]interface{}) (*chart.Chart, error) {
+					require.Equal(t, expectedWatchNamespace, config["watchNamespace"])


nit: maybe use bundle.BundleConfigWatchNamespaceKey? or split out to a const in the test package?

Just called in the bundle package since that's what we're doing in the non-test portion too.

Put watch namespace in config.

perdasilva

Awesome! Sorry for the churn, and thanks for this!

openshift-ci · 2025-09-02T15:43:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~internal/operator-controller/OWNERS~~ [perdasilva]

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

With operator-framework#2166 and operator-framework#2163 in place, annotation based config support can be removed. Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>

* OPRUN-4106: remove support for annotation based config With #2166 and #2163 in place, annotation based config support can be removed. Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com> * update docs and demo to use new config spec --------- Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>

anik120 requested a review from a team as a code owner August 26, 2025 15:34

openshift-ci bot requested review from bentito and grokspawn August 26, 2025 15:34

anik120 changed the title ~~✨ (rukpak) extend bundle renderer to accept config opts~~ ✨ OPRUN-4090: (rukpak) extend bundle renderer to accept config opts Aug 26, 2025

anik120 force-pushed the registryv1-renderer-config-support branch 2 times, most recently from 3577b5b to cb7ab21 Compare August 26, 2025 15:44

anik120 force-pushed the registryv1-renderer-config-support branch 3 times, most recently from f26e1fa to 7b919f4 Compare August 26, 2025 19:29

joelanford reviewed Aug 26, 2025

View reviewed changes

internal/operator-controller/rukpak/render/render.go Outdated Show resolved Hide resolved

joelanford reviewed Aug 26, 2025

View reviewed changes

internal/operator-controller/rukpak/render/render_test.go Outdated Show resolved Hide resolved

joelanford reviewed Aug 26, 2025

View reviewed changes

internal/operator-controller/rukpak/render/render.go Outdated Show resolved Hide resolved

anik120 force-pushed the registryv1-renderer-config-support branch 4 times, most recently from 3f1ce78 to 119d1d1 Compare August 27, 2025 15:02

anik120 force-pushed the registryv1-renderer-config-support branch 6 times, most recently from c17dec4 to 83f1974 Compare August 28, 2025 18:56

perdasilva reviewed Aug 29, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Aug 29, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Aug 29, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Aug 29, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Aug 29, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

anik120 force-pushed the registryv1-renderer-config-support branch 5 times, most recently from 94c7776 to 2f22efa Compare August 29, 2025 22:47

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/applier/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm_test.go Outdated Show resolved Hide resolved

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/rukpak/render/render.go Outdated Show resolved Hide resolved

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Outdated Show resolved Hide resolved

perdasilva reviewed Sep 1, 2025

View reviewed changes

internal/operator-controller/rukpak/convert/helm.go Show resolved Hide resolved

perdasilva changed the title ~~✨ OPRUN-4090: (rukpak) extend bundle renderer to accept config opts~~ ✨ OPRUN-4090: (rukpak) Add config support to reg+v1 bundle to chart converter Sep 2, 2025

anik120 force-pushed the registryv1-renderer-config-support branch from 2f22efa to b790af4 Compare September 2, 2025 14:08

anik120 changed the title ~~✨ OPRUN-4090: (rukpak) Add config support to reg+v1 bundle to chart converter~~ ✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter Sep 2, 2025

anik120 force-pushed the registryv1-renderer-config-support branch 2 times, most recently from 26172fe to 4a3a665 Compare September 2, 2025 14:15

perdasilva reviewed Sep 2, 2025

View reviewed changes

(rukpak) Add config support for reg+v1 bundle to chart converter

9d8f73a

Put watch namespace in config.

anik120 force-pushed the registryv1-renderer-config-support branch from 4a3a665 to 9d8f73a Compare September 2, 2025 15:03

perdasilva approved these changes Sep 2, 2025

View reviewed changes

openshift-ci bot assigned perdasilva Sep 2, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 2, 2025

openshift-merge-bot bot merged commit c56a811 into operator-framework:main Sep 2, 2025
25 checks passed

anik120 mentioned this pull request Sep 16, 2025

⚠ OPRUN-4106: remove support for annotation based config #2224

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter #2166

✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter #2166

Uh oh!

anik120 commented Aug 26, 2025 •

edited

Loading

Uh oh!

netlify bot commented Aug 26, 2025 •

edited

Loading

Uh oh!

codecov bot commented Aug 26, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anik120 commented Aug 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

perdasilva Sep 2, 2025

Uh oh!

anik120 Sep 2, 2025

Uh oh!

perdasilva left a comment

Uh oh!

openshift-ci bot commented Sep 2, 2025

Uh oh!

Uh oh!

Uh oh!

✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter #2166

✨ OPRUN-4090: (rukpak) Add config support for reg+v1 bundle to chart converter #2166

Uh oh!

Conversation

anik120 commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Reviewer Checklist

Uh oh!

netlify bot commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for olmv1 ready!

Uh oh!

codecov bot commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anik120 commented Aug 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

perdasilva Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

anik120 Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

perdasilva left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Sep 2, 2025

Uh oh!

Uh oh!

Uh oh!

anik120 commented Aug 26, 2025 •

edited

Loading

netlify bot commented Aug 26, 2025 •

edited

Loading

codecov bot commented Aug 26, 2025 •

edited

Loading