✨Add DeploymentConfig support to registry+v1 bundle renderer #2469

anik120 · 2026-01-29T21:44:25Z

Description

This PR implements Phase 2 of the Deployment Configuration RFC: extending the OLMv1 bundle renderer to apply DeploymentConfig customizations to operator deployments.

Building on the foundation from #2454, this PR enables the renderer to accept and apply deployment configuration when rendering registry+v1 bundles. The implementation follows OLMv0's behavior patterns to ensure compatibility and correctness.

The next PR will wire up the config in the ClusterExtension controller by parsing spec.install.config to convert to DeploymentConfig and thread DeploymentConfig through the controller's render call chain

Reviewer Checklist

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

netlify · 2026-01-29T21:44:30Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`04b566e`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/6980f6c0cbd7160007da60b1
😎 Deploy Preview	https://deploy-preview-2469--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.

tmshort · 2026-01-29T21:48:50Z

internal/operator-controller/config/config.go


+// DeploymentConfig is a type alias for v1alpha1.SubscriptionConfig
+// to maintain clear naming in the OLMv1 context while reusing the v0 type.
+type DeploymentConfig = v1alpha1.SubscriptionConfig


I thought we weren't going to use SubscriptionConfig because of the extra selector field?

From the RFC:

NOTE: The v0 SubscriptionConfig struct also has a [Selector](https://github.com/operator-framework/api/blob/master/pkg/operators/v1alpha1/subscription_types.go#L47) field, however it is completely ignored by the v0 controller. According to the comment in the code, it was meant to: Select which pods/ReplicaSets would receive the subscription’s configuration Match pod template labels(similar to Deployment selectors) However, the code that extracts subscription config overrides(pkg/controller/operators/olm/overrides/config.go) extracts all other fields like NodeSelector, Tolerations, Resources and are subsequently applied, but the Selector field is never extracted. OLMv1 will maintain the same behavior—accepting but ignoring this field.

Notice that there's no applySelectorConfig() function, so we're just ignoring that field.

With our wish to reuse v0 SubscriptionConfig for maintainability, we carry over nuance/s into v1. Silently ignoring the selector field being one of them.

We have to remember to document this explicitly for our users everywhere for added clarity.

Copilot

Pull request overview

Implements Phase 2 of the Deployment Configuration RFC for registry+v1 bundles by threading a DeploymentConfig through the renderer and applying those customizations to CSV-generated Deployment resources (matching OLMv0 behavior), with extensive unit test coverage.

Changes:

Add DeploymentConfig support to render.Options and a new render.WithDeploymentConfig(...) option.
Apply deployment customizations (env/envFrom, volumes, mounts, tolerations, resources, node selector, affinity, annotations) during registry+v1 CSV Deployment generation.
Add/extend unit tests covering option propagation and deployment customization behavior.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
internal/operator-controller/rukpak/render/render.go	Adds `DeploymentConfig` to render options and introduces `WithDeploymentConfig`.
internal/operator-controller/rukpak/render/render_test.go	Adds tests ensuring `DeploymentConfig` is passed through render options correctly.
internal/operator-controller/rukpak/render/registryv1/generators/generators.go	Applies `DeploymentConfig` to generated CSV `Deployment` resources via new helper functions.
internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go	Adds integration-style tests verifying `BundleCSVDeploymentGenerator` applies config fields as expected.
internal/operator-controller/rukpak/render/registryv1/generators/deployment_config_test.go	Adds unit tests targeting the new config-application helper functions.
internal/operator-controller/config/config.go	Introduces a `DeploymentConfig` alias to `v1alpha1.SubscriptionConfig` for OLMv1 naming clarity.

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

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

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

internal/operator-controller/rukpak/render/registryv1/generators/deployment_config_test.go

codecov · 2026-01-29T22:18:56Z

Codecov Report

❌ Patch coverage is 86.59794% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.75%. Comparing base (fbe909f) to head (04b566e).
⚠️ Report is 12 commits behind head on main.

Files with missing lines	Patch %	Lines
.../rukpak/render/registryv1/generators/generators.go	86.17%	8 Missing and 5 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2469      +/-   ##
==========================================
+ Coverage   69.52%   69.75%   +0.22%     
==========================================
  Files         102      102              
  Lines        8231     8451     +220     
==========================================
+ Hits         5723     5895     +172     
- Misses       2056     2087      +31     
- Partials      452      469      +17

Flag	Coverage Δ
e2e	`45.97% <4.12%> (-0.96%)`	⬇️
experimental-e2e	`13.03% <0.00%> (-0.35%)`	⬇️
unit	`57.82% <86.59%> (+0.27%)`	⬆️

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.

tmshort · 2026-01-30T21:25:36Z

Lint needs to be fixed.

perdasilva · 2026-02-02T11:47:19Z

internal/operator-controller/rukpak/render/registryv1/generators/deployment_config_test.go

+	"github.com/operator-framework/operator-controller/internal/operator-controller/config"
+)
+
+func Test_applyCustomConfigToDeployment(t *testing.T) {


should we move these tests against the public API?

i.e. WithDeploymentConfig

Copilot

Pull request overview

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

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

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

This PR implements **Phase 2** of the [Deployment Configuration RFC](https://docs.google.com/document/d/18O4qBvu5I4WIJgo5KU1opyUKcrfgk64xsI3tyXxmVEU/edit?tab=t.0): extending the OLMv1 bundle renderer to apply `DeploymentConfig` customizations to operator deployments. Building on the foundation from operator-framework#2454, this PR enables the renderer to accept and apply deployment configuration when rendering registry+v1 bundles. The implementation follows OLMv0's behavior patterns to ensure compatibility and correctness. The next PR will wire up the config in the `ClusterExtension` controller by parsing `spec.install.config` to convert to `DeploymentConfig` and thread `DeploymentConfig` through the controller's render call chain

anik120 · 2026-02-02T20:00:43Z

@perdasilva @tmshort addressed all the feedback, PTAL

tmshort · 2026-02-02T20:20:37Z

/approve

openshift-ci · 2026-02-02T20:20:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [tmshort]

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

perdasilva · 2026-02-03T13:59:02Z

/lgtm

**Summary** Completes Phase 3 of the [Deployment Configuration RFC](https://docs.google.com/document/d/1bDo3W1asZqjJTgZy7BcVOGtKOEukp0vUi5CO1ac3vwc/edit?usp=sharing). Extracts `deploymentConfig` from validated ClusterExtension configuration and passes it to the bundle renderer. Builds on: - (PR2454)[operator-framework#2454]: Config API and JSON schema validation - (PR2469)[operator-framework#2469]: Renderer support for applying deployment customizations This completes the RFC - users can now customize operator deployments via ClusterExtension.spec.config.inline: ``` config: configType: Inline inline: watchNamespace: "some-namespace" deploymentConfig: env: - name: TEST_ENV value: test-value nodeSelector: kubernetes.io/os: linux ```

**Summary** Completes Phase 3 of the [Deployment Configuration RFC](https://docs.google.com/document/d/1bDo3W1asZqjJTgZy7BcVOGtKOEukp0vUi5CO1ac3vwc/edit?usp=sharing). Extracts `deploymentConfig` from validated ClusterExtension configuration and passes it to the bundle renderer. Builds on: - (PR2454)[#2454]: Config API and JSON schema validation - (PR2469)[#2469]: Renderer support for applying deployment customizations This completes the RFC - users can now customize operator deployments via ClusterExtension.spec.config.inline: ``` config: configType: Inline inline: watchNamespace: "some-namespace" deploymentConfig: env: - name: TEST_ENV value: test-value nodeSelector: kubernetes.io/os: linux ```

Copilot AI review requested due to automatic review settings January 29, 2026 21:44

openshift-ci bot requested review from oceanc80 and tmshort January 29, 2026 21:44

Copilot started reviewing on behalf of anik120 January 29, 2026 21:44 View session

tmshort reviewed Jan 29, 2026

View reviewed changes

anik120 requested review from Copilot, perdasilva and tmshort and removed request for Copilot and oceanc80 January 29, 2026 21:50

anik120 force-pushed the config-api-update-renderer branch from 07bd38a to f8d0a5a Compare January 29, 2026 22:01

Copilot started reviewing on behalf of anik120 January 29, 2026 22:01 View session

Copilot AI reviewed Jan 29, 2026

View reviewed changes

perdasilva reviewed Feb 2, 2026

View reviewed changes

anik120 force-pushed the config-api-update-renderer branch 2 times, most recently from 2c38f50 to 8666d5f Compare February 2, 2026 19:01

Copilot AI review requested due to automatic review settings February 2, 2026 19:01

Copilot started reviewing on behalf of anik120 February 2, 2026 19:01 View session

anik120 force-pushed the config-api-update-renderer branch 2 times, most recently from 4d755ab to 4170eae Compare February 2, 2026 19:09

Copilot AI reviewed Feb 2, 2026

View reviewed changes

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

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

anik120 force-pushed the config-api-update-renderer branch from 4170eae to 04b566e Compare February 2, 2026 19:10

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

openshift-ci bot assigned perdasilva Feb 3, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2026

openshift-merge-bot bot merged commit 8daa35d into operator-framework:main Feb 3, 2026
29 checks passed

anik120 mentioned this pull request Feb 3, 2026

✨Extract and pass deploymentConfig to bundle renderer #2482

Merged

4 tasks

✨Add DeploymentConfig support to registry+v1 bundle renderer #2469

✨Add DeploymentConfig support to registry+v1 bundle renderer #2469

Conversation

anik120 commented Jan 29, 2026

Description

Reviewer Checklist

Uh oh!

netlify bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for olmv1 ready!

Uh oh!

tmshort Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

anik120 Jan 29, 2026

Choose a reason for hiding this comment

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!

codecov bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

tmshort commented Jan 30, 2026

Uh oh!

perdasilva Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

perdasilva Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

anik120 commented Feb 2, 2026

Uh oh!

tmshort commented Feb 2, 2026

Uh oh!

openshift-ci bot commented Feb 2, 2026

Uh oh!

perdasilva commented Feb 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

netlify bot commented Jan 29, 2026 •

edited

Loading

codecov bot commented Jan 29, 2026 •

edited

Loading