Skip to content

Conversation

ciarams87
Copy link
Contributor

Proposed changes

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.

Testing: Manual testing and unit testing

Closes #3721

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 ciarams87 requested a review from a team as a code owner August 19, 2025 07:44
@github-actions github-actions bot added the bug Something isn't working label Aug 19, 2025
Copy link

codecov bot commented Aug 19, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.91%. Comparing base (235a4b2) to head (dc745d7).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3754      +/-   ##
==========================================
+ Coverage   86.90%   86.91%   +0.01%     
==========================================
  Files         128      128              
  Lines       16187    16201      +14     
  Branches       62       62              
==========================================
+ Hits        14067    14081      +14     
  Misses       1948     1948              
  Partials      172      172              

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

@ciarams87 ciarams87 merged commit e09b173 into main Aug 19, 2025
64 of 66 checks passed
@ciarams87 ciarams87 deleted the fix/patch-labels branch August 19, 2025 14:05
@github-project-automation github-project-automation bot moved this from 🆕 New to ✅ Done in NGINX Gateway Fabric Aug 19, 2025
sjberman pushed a commit that referenced this pull request Aug 20, 2025
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 added a commit that referenced this pull request Aug 20, 2025
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.

Co-authored-by: Ciara Stacke <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working release-notes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Lack of dataplane service annotation possibility prevents v1 -> v2 migration
3 participants