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 (backport of #8129) #8130

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 25, 2023

Automatic cherry-pick of #8129 for branch release-2.2

Generated by action

cherry-picked commit 1912999
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.2
Your branch is up to date with 'origin/release-2.2'.

You are currently cherry-picking commit 1912999c9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/xds/context/mesh_context_builder.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   pkg/xds/context/aggregate_mesh_context.go
	both modified:   pkg/xds/sync/dataplane_watchdog.go
	both modified:   pkg/xds/sync/egress_proxy_builder.go

@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]>
@bartsmykla bartsmykla closed this Oct 25, 2023
@bartsmykla bartsmykla deleted the chore/backport-release-2.2-8129 branch October 25, 2023 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflict release-2.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bartsmykla