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

feat(kuma-dp): add a separate component to handle kuma-sidecar readiness probes (backport of #11107) #11239

Merged
merged 4 commits into from
Aug 30, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Aug 28, 2024

Automatic cherry-pick of #11107 for branch release-2.5

Generated by action

cherry-picked commit 20208eb
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 20208eb60.
  (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:
	new file:   app/kuma-dp/pkg/dataplane/readiness/component.go
	modified:   pkg/config/app/kuma-dp/config.go
	modified:   pkg/config/app/kuma-dp/testdata/default-config.golden.yaml
	modified:   pkg/xds/generator/admin_proxy_generator.go
	modified:   pkg/xds/generator/admin_proxy_generator_test.go
	modified:   pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/admin/02.envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/admin/03.envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/admin/04.envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/admin/05.envoy-config.golden.yaml
	new file:   pkg/xds/generator/testdata/admin/06.envoy-config.golden.yaml
	new file:   pkg/xds/generator/testdata/admin/07.envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/_e2e.yaml
	both modified:   app/kuma-dp/cmd/run.go
	both modified:   app/kuma-dp/pkg/dataplane/envoy/envoy.go
	both modified:   app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap.go
	both modified:   mk/k3d.mk
	both modified:   pkg/core/xds/metadata.go
	both modified:   pkg/core/xds/metadata_test.go
	both modified:   pkg/xds/bootstrap/generator.go
	both modified:   pkg/xds/bootstrap/parameters.go
	both modified:   pkg/xds/bootstrap/template_v3.go
	both modified:   pkg/xds/bootstrap/types/bootstrap_request.go
	both modified:   pkg/xds/envoy/names/resource_names.go

Changelog: feat(kuma-dp): respond probes of kuma-sidecar from kuma-dp process instead of Envoy

…ess probes (#11107)

* feat(kuma-dp): add a readiness handler
* feat(kuma-dp): support TERMINATING state
* use 9902 to expose dp readiness
* support port 0 to disable the dp readiness and use Envoy
* support ipv6 address: reuse AdminAddress and make readiness reporter listen on it
* don't send 503 when receiving SIGUSR2

---------

Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
@kumahq kumahq bot requested a review from a team as a code owner August 28, 2024 07:22
@kumahq kumahq bot requested review from michaelbeaumont and slonka and removed request for a team August 28, 2024 07:22
Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
@jijiechen jijiechen requested review from lukidzi and removed request for michaelbeaumont August 28, 2024 09:42
Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
@jijiechen jijiechen merged commit 4f178cd into release-2.5 Aug 30, 2024
5 checks passed
@jijiechen jijiechen deleted the chore/backport-release-2.5-11107 branch August 30, 2024 13:20
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.

2 participants