fix(controller): support simultaneous ALB and NGINX traffic routing validation#4460
Merged
zachaller merged 7 commits intoargoproj:masterfrom Nov 4, 2025
Conversation
puretension
changed the title
puretension
force-pushed
the
fix/alb-nginx-simultaneous-routing-4452
branch
4 times, most recently
from
987b331 to
df186c8
Compare
- Change jsonPath from {$.json} to {$} to get full response
- Update conditions to use result.json.status instead of result.status
- Fixes flaky TestCanaryInconclusiveBackgroundAnalysis e2e test
Signed-off-by: puretension <rlrlfhtm5@gmail.com>
…alidation Signed-off-by: puretension <rlrlfhtm5@gmail.com>
puretension
force-pushed
the
fix/alb-nginx-simultaneous-routing-4452
branch
from
df186c8 to
fb69697
Compare
puretension
changed the title
Remove helper functions and use inline validation for cleaner code. Reduces code complexity while maintaining the same functionality. Signed-off-by: puretension <rlrlfhtm5@gmail.com>
Reduce test code from 25 lines to 12 lines while maintaining coverage. Signed-off-by: puretension <rlrlfhtm5@gmail.com>
Contributor
Published E2E Test Results 4 files 4 suites 3h 50m 20s ⏱️ For more details on these failures, see this check. Results for commit 8e7c4f9. ♻️ This comment has been updated with latest results. |
Signed-off-by: puretension <rlrlfhtm5@gmail.com>
Contributor
Published Unit Test Results2 331 tests 2 331 ✅ 3m 1s ⏱️ Results for commit 8e7c4f9. ♻️ This comment has been updated with latest results. |
Use proper object creation before wrapping with NewLegacyIngress instead of calling non-existent GetIngress() method. Signed-off-by: puretension <rlrlfhtm5@gmail.com>
- Fix line continuation formatting in validation logic - Remove trailing whitespace in test comments Signed-off-by: puretension <rlrlfhtm5@gmail.com>
|
zachaller
approved these changes
Nov 4, 2025
6 tasks
|
Hi folks! When this improvement will be available on a GA version? Is there any release date planned? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #4452 - This PR fixes a validation issue when both ALB and NGINX traffic routing are configured simultaneously in a Rollout. Previously, the validation logic incorrectly applied NGINX validation rules to ALB ingresses, causing validation errors.
Changes
ValidateIngressfunction to check ingress ownership before applying validation rulesisNginxIngress()helper function to identify NGINX-managed ingressesisAlbIngress()helper function to identify ALB-managed ingressesTesting
Checklist:
"fix(controller): Updates such and such. Fixes #1234".