Skip to content
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.

Sign up for GitHub

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

feat(policies): allow merging by a complex key #5650

Merged
merged 4 commits into from
Jan 12, 2023
Merged

feat(policies): allow merging by a complex key #5650

merged 4 commits into from
Jan 12, 2023

Conversation

michaelbeaumont
Copy link
Contributor

@michaelbeaumont michaelbeaumont commented Jan 11, 2023 •
edited by lahabana
Loading

This allows us to move the logic from MeshHTTPRoute into core_xds

Checklist prior to review

  • Link to docs PR or issue --
  • Link to UI issue or PR --
  • Is the issue worked on linked? --
  • The PR does not hardcode values that might break projects that depend on kuma (e.g. "kumahq" as a image registry) --
  • The PR will work for both Linux and Windows, system specific functions like syscall.Mkfifo have equivalent implementation on the other OS --
  • Unit Tests --
  • E2E Tests --
  • Manual Universal Tests --
  • Manual Kubernetes Tests --
  • Do you need to update UPGRADE.md? --
  • Does it need to be backported according to the backporting policy? --
  • Do you need to explicitly set a > Changelog: entry here or add a ci/ label to run fewer/more tests?

Changelog: feat(policy): allow merging by a complex key

@michaelbeaumont
feat(policies): allow merging by a complex key
3ec9661 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont
test(pkg/core/xds): add test for mergeByKey
bba05ef 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont requested review from a team, jakubdyszkiewicz, Automaat and lobkovilya and removed request for a team and Automaat January 11, 2023 12:55
lobkovilya
lobkovilya reviewed Jan 12, 2023
View reviewed changes
pkg/core/xds/merge.go Outdated Show resolved Hide resolved
pkg/core/xds/merge.go Show resolved Hide resolved
pkg/core/xds/merge.go Outdated Show resolved Hide resolved
@michaelbeaumont
refactor: rename xdsMerge struct tag to policyMerge
6c59424 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont
refactor: rename some variables
66b15f2 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) January 12, 2023 15:28
@michaelbeaumont michaelbeaumont merged commit f53d7fe into kumahq:master Jan 12, 2023
@michaelbeaumont michaelbeaumont deleted the feat/merge_by_key branch January 12, 2023 15:43
bartsmykla pushed a commit to bartsmykla/kuma that referenced this pull request Jan 14, 2023
@michaelbeaumont @bartsmykla
feat(policies): allow merging by a complex key (kumahq#5650)
2feba91 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
bartsmykla pushed a commit to bartsmykla/kuma that referenced this pull request Jan 14, 2023
@michaelbeaumont @bartsmykla
feat(policies): allow merging by a complex key (kumahq#5650)
ff27317 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
@shaneutt shaneutt mentioned this pull request Feb 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lobkovilya lobkovilya lobkovilya approved these changes

@jakubdyszkiewicz jakubdyszkiewicz Awaiting requested review from jakubdyszkiewicz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelbeaumont @lobkovilya