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

fix(kuma-cp): fix Zone{In|E}gress sync when no mesh #8129

Merged
merged 1 commit into from
Oct 25, 2023
Merged

fix(kuma-cp): fix Zone{In|E}gress sync when no mesh #8129

merged 1 commit into from
Oct 25, 2023

Conversation

bartsmykla
Copy link
Contributor

  • Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
  • Sync ZoneIngresses and ZoneEgresses only when the hash changes.
  • Return an error with the correct resource type (ZoneEgress) when a ZoneEgress cannot be found.

Checklist prior to review

  • Link to relevant issue as well as docs and UI issues
    • No relevant issue
  • This will not break child repos: it doesn't hardcode values (.e.g "kumahq" as a image registry) and it will work on Windows, system specific functions like syscall.Mkfifo have equivalent implementation on the other OS
    • It won't
  • Tests (Unit test, E2E tests, manual test on universal and k8s)
    • Don't forget ci/ labels to run additional/fewer tests
    • Manually tested on k3d
  • Do you need to update UPGRADE.md?
    • There is no need
  • Does it need to be backported according to the backporting policy? (this GH action will add "backport" label based on these file globs, if you want to prevent it from adding the "backport" label use no-backport-autolabel label)
    • It does

@bartsmykla
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh
648aa69 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
@bartsmykla bartsmykla added ci/force-publish PR: push artifacts even if we're on a PR (use very carefully) backport labels Oct 25, 2023
@bartsmykla bartsmykla requested a review from a team as a code owner October 25, 2023 04:59
@bartsmykla bartsmykla mentioned this pull request Oct 25, 2023
Closed
5 tasks
@bartsmykla bartsmykla enabled auto-merge (squash) October 25, 2023 05:02
slonka
slonka approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@slonka slonka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a test somewhere that you could extend to check for this case?

pkg/xds/context/aggregate_mesh_context.go Show resolved Hide resolved
@bartsmykla bartsmykla merged commit 1912999 into master Oct 25, 2023
@bartsmykla bartsmykla deleted the fix/zoneegress-and-zone-ingress-when-no-mesh-fix branch October 25, 2023 06:01
@bartsmykla
Copy link
Contributor Author

Is there a test somewhere that you could extend to check for this case?

There is none I found

@github-actions
Copy link
Contributor

github-actions bot commented Oct 25, 2023 •
edited
Loading

backporting to release-2.2 with action

backporting to release-2.3 with action
backporting to release-2.4 with action

kumahq bot pushed a commit that referenced this pull request Oct 25, 2023
@bartsmykla @kumahq
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
7cc5b0e 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
@kumahq kumahq bot mentioned this pull request Oct 25, 2023
Closed
kumahq bot pushed a commit that referenced this pull request Oct 25, 2023
@bartsmykla @kumahq
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
fedeec0 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
@kumahq kumahq bot mentioned this pull request Oct 25, 2023
Closed
kumahq bot pushed a commit that referenced this pull request Oct 25, 2023
@bartsmykla @kumahq
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
ac01b31 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
This was referenced Oct 25, 2023
Closed
Closed
Merged
kumahq bot pushed a commit that referenced this pull request Oct 25, 2023
@bartsmykla @kumahq
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
2144e52 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
kumahq bot pushed a commit that referenced this pull request Oct 25, 2023
@bartsmykla @kumahq
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
533b84c 
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
@bartsmykla bartsmykla mentioned this pull request Oct 25, 2023
Open
bartsmykla added a commit that referenced this pull request Oct 25, 2023
@kumahq @bartsmykla
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (backport of #8129)…
38ca2a3 
… (#8134)

fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)

- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh.
- Sync ZoneIngresses and ZoneEgresses only when the hash changes.
- Return an error with the correct resource type (ZoneEgress) when
  a ZoneEgress cannot be found.

Signed-off-by: Bart Smykla <[email protected]>
Co-authored-by: Bart Smykla <[email protected]>
@BrewTestBot BrewTestBot mentioned this pull request Nov 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slonka slonka slonka approved these changes

@jakubdyszkiewicz jakubdyszkiewicz Awaiting requested review from jakubdyszkiewicz

Assignees
No one assigned
Labels
backport ci/force-publish PR: push artifacts even if we're on a PR (use very carefully)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bartsmykla @slonka