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(*): move adminPort to DPP resource #3739

Merged
merged 15 commits into from
Jan 27, 2022

Conversation

lobkovilya
Copy link
Contributor

@lobkovilya lobkovilya commented Jan 24, 2022

Summary

Today Control Planes don't have an information on admin port in general. Technically adminPort could be looked up through xDS metadata for connected DPPs, but that's not enough if we want to expose /config_dump though Control Plane API. That's why current PR moves the source of truth for admin port from kuma-dp run flags to DPP resource:

networking:
  admin:
    port: 9901

The same is applicable for ZoneIngress.

Full changelog

  • disable starting CoreDNS on ZoneIngress, since we aren't hijacking DNS traffic there
  • parse BootstrapConfig file in kuma-dp run to get adminPort for MetricsHijacker
  • change the default adminPort on Universal to 9901
  • add admin section both for DPP and ZoneIngress resources
  • deprecate --admin-port flag for kuma-dp
  • deprecate KUMA_DATAPLANE_ADMIN_PORT for kuma-dp
  • deprecate KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_ADMIN_PORT for kuma-cp (since it duplicates KUMA_BOOTSTRAP_SERVER_PARAMS_ADMIN_PORT)
  • add Pod annotation kuma.io/envoy-admin-port

Issues resolved

Fix #3717

Documentation

Testing

  • Unit tests
  • E2E tests
  • Manual testing on Universal
  • Manual testing on Kubernetes

Backwards compatibility

  • Update UPGRADE.md with any steps users will need to take when upgrading.
  • Add backport-to-stable label if the code follows our backporting policy

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya requested a review from a team as a code owner January 24, 2022 14:53
@lobkovilya lobkovilya marked this pull request as draft January 24, 2022 14:54
@lobkovilya lobkovilya marked this pull request as ready for review January 24, 2022 15:41
@lobkovilya lobkovilya changed the title feat(*) move adminPort to DPP resource feat(*): move adminPort to DPP resource Jan 24, 2022
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2022

Codecov Report

Merging #3739 (cac0857) into master (2fd98ee) will increase coverage by 0.02%.
The diff coverage is 68.44%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3739      +/-   ##
==========================================
+ Coverage   50.98%   51.01%   +0.02%     
==========================================
  Files         930      934       +4     
  Lines       57260    57403     +143     
==========================================
+ Hits        29196    29283      +87     
- Misses      25743    25780      +37     
- Partials     2321     2340      +19     
Impacted Files Coverage Δ
pkg/config/plugins/runtime/k8s/config.go 86.47% <ø> (-0.08%) ⬇️
pkg/core/alias.go 13.33% <ø> (ø)
...ime/k8s/controllers/gateway_instance_controller.go 0.00% <ø> (ø)
...e/k8s/controllers/gatewayapi/gateway_controller.go 0.00% <ø> (ø)
pkg/plugins/runtime/k8s/metadata/annotations.go 100.00% <ø> (ø)
pkg/plugins/runtime/k8s/plugin.go 1.09% <0.00%> (-0.01%) ⬇️
pkg/plugins/runtime/k8s/plugin_gateway.go 0.00% <0.00%> (ø)
test/e2e/healthcheck/universal/policy_http.go 0.00% <0.00%> (ø)
test/e2e/healthcheck/universal/policy_tcp.go 0.00% <0.00%> (ø)
...ugins/runtime/k8s/controllers/ingress_converter.go 67.50% <20.00%> (-3.17%) ⬇️
... and 31 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2fd98ee...cac0857. Read the comment docs.

pkg/config/app/kuma-dp/deprecate.go Outdated Show resolved Hide resolved
api/mesh/v1alpha1/dataplane.proto Outdated Show resolved Hide resolved
app/kuma-dp/cmd/run.go Outdated Show resolved Hide resolved
app/kuma-dp/cmd/run_test.go Show resolved Hide resolved
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
UPGRADE.md Outdated Show resolved Hide resolved
api/mesh/v1alpha1/admin.proto Outdated Show resolved Hide resolved
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya merged commit e2f56dd into master Jan 27, 2022
@lobkovilya lobkovilya deleted the feat/move-admin-port-to-dpp-res branch January 27, 2022 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Store envoy admin port in data plane proxy resource
4 participants