✨ OPRUN-4090: (rukpak) extend bundle renderer to accept config opts #2166

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

Pass installNamespace and watchNamespace as config values

Description

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	`2f22efa`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/68b22df35cadad00082c7c99
😎 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

❌ Patch coverage is 93.87755% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 73.06%. Comparing base (d95f426) to head (8e2e4bb).

Files with missing lines	Patch %	Lines
...nternal/operator-controller/rukpak/convert/helm.go	93.87%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2166      +/-   ##
==========================================
+ Coverage   72.71%   73.06%   +0.35%     
==========================================
  Files          79       79              
  Lines        7378     7422      +44     
==========================================
+ Hits         5365     5423      +58     
+ Misses       1666     1649      -17     
- Partials      347      350       +3

Flag	Coverage Δ
e2e	`44.14% <48.97%> (-0.01%)`	⬇️
experimental-e2e	`58.41% <59.18%> (+2.28%)`	⬆️
unit	`58.40% <93.87%> (+0.22%)`	⬆️

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

openshift-ci · 2025-08-29T16:24:45Z

[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 kevinrizza 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:

OWNERS

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

Pass installNamespace and watchNamespace as config values

perdasilva · 2025-09-01T07:44:02Z

internal/operator-controller/applier/helm.go

+	bundleConfig := map[string]interface{}{}
+	bundleConfig[bundle.BundleConfigWatchNamespaceKey] = watchNamespace
+	bundleConfig[bundle.BundleConfigInstallNamespaceKey] = ext.Spec.Namespace


Suggested change

bundleConfig := map[string]interface{}{}

bundleConfig[bundle.BundleConfigWatchNamespaceKey] = watchNamespace

bundleConfig[bundle.BundleConfigInstallNamespaceKey] = ext.Spec.Namespace

bundleConfig := map[string]interface{}{

bundle.BundleConfigInstallNamespaceKey: ext.Spec.Namespace,

bundle.BundleConfigWatchNamespaceKey: watchNamespace,

}

perdasilva · 2025-09-01T07:46:14Z

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

+	config := map[string]interface{}{}
+	config[bundle.BundleConfigInstallNamespaceKey] = "install-namespace"
+	config[bundle.BundleConfigWatchNamespaceKey] = "watch-namespace"


nit:

Suggested change

config := map[string]interface{}{}

config[bundle.BundleConfigInstallNamespaceKey] = "install-namespace"

config[bundle.BundleConfigWatchNamespaceKey] = "watch-namespace"

config := map[string]interface{}{

bundle.BundleConfigInstallNamespaceKey: "install-namespace",

bundle.BundleConfigWatchNamespaceKey: "watch-namespace",

}

same for the others

perdasilva · 2025-09-01T07:47:36Z

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

@@ -111,7 +124,7 @@ type BundleRenderer struct {
 	ResourceGenerators []ResourceGenerator
 }

-func (r BundleRenderer) Render(rv1 bundle.RegistryV1, installNamespace string, opts ...Option) ([]client.Object, error) {
+func (r BundleRenderer) Render(rv1 bundle.RegistryV1, opts ...Option) ([]client.Object, error) {


Let's not make install namespace optional here. We will always need an install namespace. So, I'd revert the changes to this package.

perdasilva · 2025-09-01T07:48:40Z

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

 	rv1, err := bundle.GetBundle()
 	if err != nil {
 		return nil, err
 	}

+	// Convert config map to render options
+	var opts []render.Option


nit:

Suggested change

var opts []render.Option

opts := []render.Option{

render.WithCertificateProvider(r.CertificateProvider),

}

then remove line 37

perdasilva · 2025-09-01T07:49:39Z

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

+	// Convert config map to render options
+	var opts []render.Option
+	if config != nil {
+		if installNs, ok := config[bundlepkg.BundleConfigInstallNamespaceKey].(string); ok {


we should return an error here as installNamespace is mandatory.

perdasilva · 2025-09-01T07:53:32Z

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

+		if installNs, ok := config[bundlepkg.BundleConfigInstallNamespaceKey].(string); ok {
+			opts = append(opts, render.WithInstallNamespace(installNs))
+		}
+		if watchNs, ok := config[bundlepkg.BundleConfigWatchNamespaceKey].(string); ok {


let's bring back deriveDefaults and set watchNamespaces to:

corev1.NamespaceAll iff AllNamespaces is supported

install-namespace iff the only supported install-mode is OwnNamespace

an error is its not set and SingleNamespace is the only supported mode

an error if there are no supported install modes

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