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(kuma-cp): deduplicate dataplane inbounds by address and port combination #12760

Merged

Automaat merged 20 commits into kumahq:master from Automaat:feat/inbound-name-from-pod

Apr 8, 2025

Contributor

Automaat commented Feb 5, 2025 •

edited

Loading

Motivation

We now can have multiple inbounds if multiple services select the same address and port, but we will generate Envoy resources only for one of these. We should deduplicate them on creation so that we don't have inbounds that don't correlate with Envoy resources. This can be also useful for GUI.

Inbound deduplication is enabled only when MeshService mode Exclusive is enabled


          feat(kuma-cp): inbound name should be taken from pod instead of service

30d0259

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

Automaat added the ci/run-full-matrix label

Automaat requested a review from a team as a code owner

February 5, 2025 14:37

Automaat requested review from jijiechen and Icarus9913

February 5, 2025 14:37

Contributor

github-actions bot commented Feb 5, 2025

Reviewer Checklist

🔍 Each of these sections need to be checked by the reviewer of the PR 🔍:
If something doesn't apply please check the box and add a justification if the reason is non obvious.

Is the PR title satisfactory? Is this part of a larger feature and should be grouped using > Changelog?
PR description is clear and complete. It Links to relevant issue as well as docs and UI issues
This will not break child repos: it doesn't hardcode values (.e.g "kumahq" as an image registry)
IPv6 is taken into account (.e.g: no string concatenation of host port)
Tests (Unit test, E2E tests, manual test on universal and k8s)
- Don't forget ci/ labels to run additional/fewer tests
Does this contain a change that needs to be notified to users? In this case, UPGRADE.md should be updated.
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)

Automaat added 2 commits

February 6, 2025 15:18


          feat(kuma-cp): fix tests

fc93dba

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          feat(kuma-cp): fix tests

514fe96

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

Automaat mentioned this pull request

feat(kuma-cp): take inbound name from pod instead of service #12783

Merged

Automaat added 2 commits

February 12, 2025 09:16


          Merge remote-tracking branch 'origin/master' into feat/inbound-name-f…

dfe4edb

…rom-pod

# Conflicts:
#	pkg/plugins/runtime/k8s/controllers/pod_controller_test.go
#	pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml


          fix(e2e): fix picking right interface for delegated gateway

8817d6d

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

Automaat changed the title ~~feat(kuma-cp): inbound name should be taken from pod instead of service~~ feat(kuma-cp): deduplicate dataplane inbounds by address and port conmbination

Automaat changed the title ~~feat(kuma-cp): deduplicate dataplane inbounds by address and port conmbination~~ feat(kuma-cp): deduplicate dataplane inbounds by address and port combination

Automaat added 2 commits

February 12, 2025 13:56


          fix(e2e): fix delegated gateway behaviour

aca4d0a

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          fix(e2e): keep first inbound when deduplicating

dab5391

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

jijiechen reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

jijiechen previously approved these changes

View reviewed changes

Member

jijiechen left a comment

Looks good to me.

Automaat dismissed jijiechen’s stale review

March 17, 2025 10:27

not ready yet

Automaat marked this pull request as draft

March 17, 2025 10:28

Automaat and others added 7 commits

March 17, 2025 11:45


          Merge branch 'master' into feat/inbound-name-from-pod

b020271


          Merge branch 'master' into feat/inbound-name-from-pod

d3a5a65


          feat(inbounds): fix unit tests

3ad8235

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          feat(inbounds): deduplicate inbounds only for MeshService exclusive

653f1e6

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          feat(inbounds): add test for deduplication

21f1407

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          feat(inbounds): fix check

bb69589

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          feat(inbounds): update comments

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

Automaat marked this pull request as ready for review

March 21, 2025 06:57

jijiechen reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/pod_controller.go Outdated Show resolved Hide resolved

jijiechen reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

jijiechen reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Show resolved Hide resolved


          feat(inbounds): remove unneeded log

35f8d6d

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

lobkovilya reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

lukidzi assigned Automaat


          feat(kuma-cp): add information about new rules api and dataplane kind…

05ba8ae

… in upgrade md

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

slonka requested a review from lobkovilya

March 28, 2025 10:15

lobkovilya reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/pod_converter.go Outdated Show resolved Hide resolved

Automaat and others added 3 commits

April 7, 2025 10:56


          feat(kuma-cp): fix code comments

367fd61

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>


          Merge branch 'master' into feat/inbound-name-from-pod

84aa880


          feat(kuma-cp): fix check

bafca0a

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

lukidzi reviewed

View reviewed changes

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Show resolved Hide resolved

lukidzi previously approved these changes

View reviewed changes

Icarus9913 previously approved these changes

View reviewed changes

Contributor

Icarus9913 left a comment •

edited

Loading

@Automaat Please supplement the description to mention that this deduplicate operation only exists in MeshService Exclusive mode

pkg/plugins/runtime/k8s/controllers/pod_controller.go Outdated Show resolved Hide resolved

pkg/plugins/runtime/k8s/controllers/inbound_converter.go Outdated Show resolved Hide resolved


          feat(kuma-cp): code review

8c44108

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

Automaat dismissed stale reviews from Icarus9913 and lukidzi via

8c44108

April 8, 2025 09:23

Icarus9913 approved these changes

View reviewed changes

Automaat merged commit faaa45a into kumahq:master

25 checks passed

lukidzi mentioned this pull request

Config rejected when there is a headless service2 point to a same set of pods of service1 with different appProtocol #11513

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci/run-full-matrix