Skip to content

🐛 OCPBUGS-76380: fix(deploymentConfig): merge volumes/volumeMounts by name instead of appending#2582

Open
camilamacedo86 wants to merge 1 commit intooperator-framework:mainfrom
camilamacedo86:fix-duplicate
Open

🐛 OCPBUGS-76380: fix(deploymentConfig): merge volumes/volumeMounts by name instead of appending#2582
camilamacedo86 wants to merge 1 commit intooperator-framework:mainfrom
camilamacedo86:fix-duplicate

Conversation

Copilot AI review requested due to automatic review settings March 20, 2026 14:41
@netlify
Copy link

netlify bot commented Mar 20, 2026

Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 3dfb483
🔍 Latest deploy log https://app.netlify.com/projects/olmv1/deploys/69bd5f01b765320008b2706a
😎 Deploy Preview https://deploy-preview-2582--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@openshift-ci
Copy link

openshift-ci bot commented Mar 20, 2026

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

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

@camilamacedo86 camilamacedo86 changed the title 🐛 fix(deploymentConfig): merge volumes/volumeMounts by name instead of appending 🐛 OCPBUGS-76380: fix(deploymentConfig): merge volumes/volumeMounts by name instead of appending Mar 20, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the operator-controller’s DeploymentConfig rendering logic to merge volumes and volumeMounts by name (overriding existing entries) rather than blindly appending, aligning behavior with legacy OLM injection semantics. It also adds unit and e2e coverage around the expected volume/volumeMount application.

Changes:

  • Change DeploymentConfig rendering to merge volumes and volumeMounts by name (override on collision).
  • Add unit tests verifying override-vs-append behavior for volumes and volumeMounts.
  • Add an e2e scenario intended to validate that configured volumes/volumeMounts appear on the operator Deployment.

Reviewed changes

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

File Description
test/e2e/features/install.feature Adds an e2e scenario asserting DeploymentConfig volumes/volumeMounts are applied.
internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go Adds unit tests to validate merge behavior for volumes and volumeMounts.
internal/operator-controller/rukpak/render/registryv1/generators/generators.go Implements merge-by-name logic for volumes and volumeMounts and wires it into DeploymentConfig application.

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

@codecov
Copy link

codecov bot commented Mar 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.82%. Comparing base (0db26d7) to head (3dfb483).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2582      +/-   ##
==========================================
+ Coverage   67.74%   67.82%   +0.08%     
==========================================
  Files         137      137              
  Lines        9560     9586      +26     
==========================================
+ Hits         6476     6502      +26     
  Misses       2585     2585              
  Partials      499      499              
Flag Coverage Δ
e2e 38.04% <0.00%> (-0.12%) ⬇️
experimental-e2e 50.88% <0.00%> (-0.19%) ⬇️
unit 52.93% <100.00%> (+0.12%) ⬆️

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants