fix: retain non-nginx canary annotations. Fixes: #1070

[jahvon]

The current patch applied for nginx canaries does not play nicely with other controller that may be modifying Ingress annotations. In our case, the Rancher field.cattle.io/publicEndpoints is repeatedly added/removed, resulting in a significant amount of updates to Ingress resources in the cluster.

With this fix, before building and applying the canary ingress patch, all annotations from the existing canary ingress will be copied over to the desired Ingress.

fixes: #1070

Checklist:

• Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
• The title of the PR is (a) conventional with a list of types and scopes found here, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
• I've signed my commits with DCO
• I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
• My builds are green. Try syncing with master if they are not.
• My organization is added to USERS.md.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

[jahvon]

I've also tested this in a RKE cluster. Here is a screenshot of the PATCH|POST|PUT|APPLY API Server request for Ingresses (before and after)

[github-actions]

Published E2E Test Results

  4 files    4 suites   3h 13m 39s ⏱️
113 tests 106 ✅  7 💤 0 ❌
452 runs  424 ✅ 28 💤 0 ❌

Results for commit e7f029d.

[github-actions]

Published Unit Test Results

2 265 tests   2 265 ✅  2m 58s ⏱️
  128 suites      0 💤
    1 files        0 ❌

Results for commit e7f029d.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.83%. Comparing base (23e186e) to head (e7f029d).
Report is 56 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3806      +/-   ##
==========================================
- Coverage   83.87%   83.83%   -0.04%     
==========================================
  Files         162      162              
  Lines       18524    18531       +7     
==========================================
- Hits        15537    15536       -1     
- Misses       2119     2123       +4     
- Partials      868      872       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

---

🚨 Try these New Features:

• Flaky Tests Detection - Detect and resolve failed and flaky tests
• JS Bundle Analysis - Avoid shipping oversized bundles

[mozemke]

hi @zachaller,

i`m so glad this got merged! :)
do you have any idea when the next argo rollouts release with these changes might be coming out?