fix: remove patch label/ annotation cross contamination (#3754) #3766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

sjberman merged 1 commit into release-2.1 from fix/patch-labels

Aug 20, 2025

Merged

fix: remove patch label/ annotation cross contamination (#3754) #3766

sjberman merged 1 commit into release-2.1 from fix/patch-labels

Aug 20, 2025

Conversation

sjberman

Copy link

Collaborator

@sjberman sjberman commented Aug 20, 2025 •

edited

Loading

Cherrypick of #3754

Problem: Patching the Service object labels and annotations results in the Deployment also getting these labels and annotations, and vice versa, which is unexpected behavior.

Solution: Create separate copies of the base label and annotation maps for each object. Since maps are passed by reference in Go, modifying the labels for one object was affecting the other by updating the shared reference.

Checklist

Before creating a PR, run through this checklist and mark each as complete.

I have read the CONTRIBUTING doc
I have added tests that prove my fix is effective or that my feature works
I have checked that all unit tests pass after adding my changes
I have updated necessary documentation
I have rebased my branch onto main
I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

Release notes

If this PR introduces a change that affects users and needs to be mentioned in the release notes,
please add a brief note that summarizes the change.

Fixed an issue where NginxProxy patches applied to one resource type (Service/Deployment/DaemonSet) would unintentionally modify other resource types.

@ciarams87 @sjberman


 fix: remove patch label/ annotation cross contamination ( #3754 )

ce25d13

Problem: Patching the Service object labels and annotations results in the Deployment also getting these labels and annotations, and vice versa, which is unexpected behavior.
Solution: Create separate copies of the base label and annotation maps for each object. Since maps are passed by reference in Go, modifying the labels for one object was affecting the other by updating the shared reference.

@sjberman sjberman requested a review from a team as a code owner

August 20, 2025 20:58

@github-project-automation github-project-automation bot added this to NGINX Gateway Fabric

Aug 20, 2025

@github-project-automation github-project-automation bot moved this to 🆕 New in NGINX Gateway Fabric

Aug 20, 2025

@nginx-bot nginx-bot bot added the release-notes label

Aug 20, 2025

@github-actions github-actions bot added the bug label

Aug 20, 2025

salonichf5

salonichf5 approved these changes

Aug 20, 2025

View reviewed changes

@codecov Codecov

Copy link

codecov bot commented Aug 20, 2025 •

edited

Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.93%. Comparing base (9b7c9a8) to head (ce25d13).
⚠️ Report is 1 commits behind head on release-2.1.

Additional details and impacted files

@@ Coverage Diff @@
## release-2.1 #3766 +/- ##
===============================================
- Coverage 86.93% 86.93% -0.01% 
===============================================
 Files 128 128 
 Lines 15986 16000 +14 
 Branches 62 62 
===============================================
+ Hits 13898 13909 +11 
- Misses 1921 1923 +2 
- Partials 167 168 +1

☔ 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.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.