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.

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

fix(kuma-cp): consistently update ZoneIngress available services (backport of #10426) #10483

Merged
merged 3 commits into from
Jun 17, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jun 14, 2024

Automatic cherry-pick of #10426 for branch release-2.7

Generated by action

cherry-picked commit 08bb137
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 08bb1373c.
  (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:   docs/generated/raw/kuma-cp.yaml
	modified:   pkg/config/app/kuma-cp/kuma-cp.defaults.yaml
	modified:   pkg/config/loader_test.go
	modified:   pkg/config/multizone/multicluster.go
	modified:   pkg/xds/ingress/dataplane.go
	modified:   pkg/xds/ingress/dataplane_test.go
	modified:   pkg/xds/sync/ingress_proxy_builder.go
	modified:   pkg/xds/sync/proxy_builder_test.go
	new file:   pkg/zone/available_services.go
	new file:   pkg/zone/available_services_test.go
	new file:   pkg/zone/components.go
	new file:   pkg/zone/zone_suite_test.go
	new file:   test/e2e_env/multizone/connectivity/available_services.go
	modified:   test/e2e_env/multizone/sync/sync.go
	modified:   test/framework/constants.go
	modified:   test/framework/setup.go
	modified:   test/framework/universal_app.go
	modified:   test/framework/universal_cluster.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/kuma-cp/cmd/run.go
	both modified:   test/e2e_env/multizone/multizone_suite_test.go

)

* feat(kuma-cp): update ZoneIngress in separate component
* test(e2e): add ability to have multiple ZoneIngresses
* test(e2e): make killing and starting an app easier
* test(e2e): add test for incorrect ZoneIngress available services behavior

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Co-authored-by: Lukasz Dziedziak <lukidzi@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner June 14, 2024 17:01
@kumahq kumahq bot requested review from michaelbeaumont and slonka and removed request for a team June 14, 2024 17:01
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) June 17, 2024 15:44
@michaelbeaumont michaelbeaumont merged commit b0d8cd5 into release-2.7 Jun 17, 2024
15 checks passed
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.7-10426 branch June 17, 2024 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant