Repository navigation
Support OAP's separated receiver and query ports - #207
Merged
Merged
Conversation
3 of 6 tasks
There was a problem hiding this comment.
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Copilot review overview
4 open issues
Therestrow reads as if GraphQL is always served on12800, but this doc now supports… · New This phrasing is internally inconsistent (“grpc and rest carry … cluster traffic” followed by “and… · New Whenoap.ports.queryis set,oap.ports.restis no longer the GraphQL query port (GraphQL moves… · New12800is only the default whenoap.ports.restremains at its default. Since users can override… · New
What changed in this PR
Adds Helm chart support and documentation for separating SkyWalking OAP receiver and query traffic onto dedicated ports so they can be exposed/TLS’d independently.
Changes:
- Introduces optional
oap.ports.receiver-grpc,oap.ports.receiver-rest, andoap.ports.queryvalues plus corresponding OAP env vars. - Updates Horizon and Satellite chart wiring to use the separated ports when configured.
- Expands docs (endpoints, values reference, UI docs) and changelog to describe the new behavior.
| File | Description |
|---|---|
| docs/ui/horizon-ui.md | Documents Horizon’s OAP URLs/ports, updated for optional query port. |
| docs/ui/configure.md | Updates HORIZON_OAP_QUERY_URL docs to reflect query/rest selection. |
| docs/reference/skywalking-chart-values.md | Adds new values rows and updates oap.ports.rest semantics. |
| docs/expose/oap-endpoints.md | Documents the separated receiver/query ports and their implications. |
| docs/changes/changes.md | Adds a 5.1.0 changelog entry for the new ports feature. |
| chart/skywalking/values.yaml | Adds commented-out example values for the separated ports. |
| chart/skywalking/templates/ui-deployment.yaml | Makes Horizon query URL prefer oap.ports.query when set. |
| chart/skywalking/templates/ui-configmap.yaml | Makes UI config defaults prefer oap.ports.query when set. |
| chart/skywalking/templates/satellite-deployment.yaml | Makes Satellite prefer receiver-grpc when set. |
| chart/skywalking/templates/oap-deployment.yaml | Sets OAP env vars for the new ports when configured. |
| chart/skywalking/templates/NOTES.txt | Notes the computed GraphQL port when UI is disabled. |
Review effort: Lite
Three opt-in keys under oap.ports, receiver-grpc, receiver-rest and query, publish OAP's separated ports and set SW_RECEIVER_GRPC_PORT, SW_RECEIVER_SHARING_REST_PORT and SW_QUERY_SERVER_REST_PORT. Horizon's queryUrl follows query and Satellite forwards to receiver-grpc. With none of them set, the rendered chart is unchanged.
wu-sheng
force-pushed
the
feat/oap-split-ports
branch
from
November 16, 2026 06:53
14e52d8 to
96b7ac9
Compare
kezhenxu94
approved these changes
Nov 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

OAP can move agent traffic and query traffic off the core ports:
receiver-sharing-servermoves the gRPC and HTTP receivers (SW_RECEIVER_GRPC_PORT,SW_RECEIVER_SHARING_REST_PORT), and the newquery-servermodule in apache/skywalking#14238 moves GraphQL, the AI agent conversation API and/status/config/ttl(SW_QUERY_SERVER_REST_PORT, OAP 11.2.0+). This lets the chart use them.values.yaml: three commented-out keys underoap.ports,receiver-grpc: 11811,receiver-rest: 12811andquery: 12810. Like every key there, a key that is set becomes a container port and a port on the one OAP Service.oap-deployment.yaml: each key that is set also sets its OAP variable.HORIZON_OAP_QUERY_URLand the ConfigMap'squeryUrluseoap.ports.querywhen set, elseoap.ports.rest.SATELLITE_GRPC_CLIENT_KUBERNETES_EXTRA_PORTusesreceiver-grpcwhen set, elsegrpc.NOTES.txtnames the query port when the UI is disabled.12800: the core REST server keeps listening there.docs/expose/oap-endpoints.md, rows in the values reference and the Horizon pages, and a 5.1.0 changelog entry.With none of the keys set,
helm templaterenders the same manifests asmaster, byte for byte; onlyNOTES.txtwith the UI disabled now prints the GraphQL port it computes (12800) instead of "default 12800". With all three set, the render adds the three container ports, the three Service ports and the three variables, and changes only the Satellite port,HORIZON_OAP_QUERY_URL, and the init Job's name, because these values are part of its name hash. Withui.configset, the ConfigMap'squeryUrlalso renders12810.helm lintpasses. The chart's e2e still pins OAP 11.0.0, which has noquery-server, so it does not exercisequeryyet; OAP's own e2e (simple/query-port) covers the split ports.🤖 Generated with Claude Code