feat: impl mergeType in BackendTrafficPolicy#5795
Merged
zirain merged 8 commits intoenvoyproxy:mainfrom Apr 30, 2025
Merged
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5795 +/- ##
==========================================
+ Coverage 65.32% 65.35% +0.03%
==========================================
Files 221 222 +1
Lines 35314 35459 +145
==========================================
+ Hits 23068 23174 +106
- Misses 10821 10851 +30
- Partials 1425 1434 +9 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
zirain
force-pushed
the
btp-merge
branch
4 times, most recently
from
f9ec6aa to
826a573
Compare
arkodg
reviewed
Apr 28, 2025
internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml
Outdated
Show resolved
Hide resolved
arkodg
reviewed
Apr 28, 2025
arkodg
reviewed
Apr 28, 2025
arkodg
reviewed
Apr 28, 2025
arkodg
reviewed
Apr 28, 2025
Contributor
|
thanks @zirain, this looks good ! added some minor comments |
Signed-off-by: zirain <[email protected]>
Signed-off-by: zirain <[email protected]>
Signed-off-by: zirain <[email protected]>
Signed-off-by: zirain <[email protected]>
Signed-off-by: zirain <[email protected]>
zhaohuabing
reviewed
Apr 29, 2025
internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml
Outdated
Show resolved
Hide resolved
zhaohuabing
reviewed
Apr 29, 2025
internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml
Show resolved
Hide resolved
Signed-off-by: zirain <[email protected]>
zhaohuabing
reviewed
Apr 29, 2025
internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.out.yaml
Show resolved
Hide resolved
arkodg
reviewed
Apr 29, 2025
internal/gatewayapi/testdata/backendtrafficpolicy-strategic-merge.in.yaml
Show resolved
Hide resolved
Signed-off-by: zirain <[email protected]>
Signed-off-by: zirain <[email protected]>
arkodg
approved these changes
Apr 30, 2025
Contributor
arkodg
left a comment
arkodg
left a comment
There was a problem hiding this comment.
LGTM thanks, lets track the list merging piece as a separate issue
zirain
commented
Apr 30, 2025
| // | ||
| // +optional | ||
| HTTPUpgrade []*ProtocolUpgradeConfig `json:"httpUpgrade,omitempty"` | ||
| HTTPUpgrade []*ProtocolUpgradeConfig `json:"httpUpgrade,omitempty" patchMergeKey:"type" patchStrategy:"merge"` |
Member
Author
There was a problem hiding this comment.
@arkodg we need this tag for every slice we want to merge.
zhaohuabing
approved these changes
Apr 30, 2025
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.
xref: #1934