Repository navigation
fix: route dashboard MCP and OAuth paths to Control - #502
Merged
Merged
Conversation
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
[Medium impact] The reviewed changes appear safe to merge.
|
Co-Authored-By: Claude <noreply@anthropic.com>
main took agent-relay 0.7.63 for sessions-pipeline 0.8.52, so this change moves to the next version. The registry gets a new current entry agent-relay-0.7.64 (0.7.63 plus relay-webapp 0.2.8) and 0.7.63 becomes planned. Chart.lock, the generated requirements doc and the subdomain golden hashes are regenerated; against main only the six GCP profiles and relay-webapp move, which is the ingress route change. Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
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.
Fixes #499
Dashboard-origin MCP and OAuth requests fall through to the dashboard's HTML catch-all. Route the seven missing prefixes to Control before
/on the leaf, GKE, EKS script, chart-rendered EKS and Azure edges:/mcp,/cloud/mcp/.well-known/oauth-protected-resource/.well-known/oauth-authorization-server/.well-known/openid-configuration/cloud/.well-known,/cloud/oauthConfirmed the list against the pinned Control 0.5.24 image's recorded source,
edad6432b07ac9997fb7af9c29999b52c81e0c5a, insrc/mcp/routes.ts,src/mcp/oauth/routes.tsandsrc/mcp/oauth/protocol.ts. The requested list matches. Token, registration and revocation already route through/cloud/api.The leaf and GKE charts share
relay-webapp.controlPaths; app-prefixed paths derive from the parent ofruntime.apiBasePath. A root/apibase omits the broad/.well-knownroute. Only the three named root discovery prefixes are claimed, leaving ACME available. Other hosts are unchanged. Kind's supplemental Ingress remains/apionly because its leaf dashboard Ingress supplies all seven new paths.GKE renders 11 dashboard Prefix paths in split-host mode, 12 in single-host mode, reusing the existing API Service and BackendConfig (
timeoutSec: 3600). This is below the documented URL-map path matcher limit. Rendering proves the desired Ingress; no live URL map was inspected. EKS with Chief enabled emits Exact paths followed by ordered wildcards, retaining Chief precedence.Integration with #513: #513 merged first. This PR merges
origin/mainat422cbb19and expands the neweksIngress.controlPathsdefault to the script's ten-path list. Thevalues.yamldefault is mirrored by a compatibility helper used throughdigwhen saved values lack the key or set it to null. An explicitly empty list stays empty; equivalence tests keep the normal and fallback defaults aligned. README and EKS values comments describe the new default. Equivalence tests cover the expanded default and explicitly pinned two- and three-path legacy lists. Every MCP/OAuth prefix fits acontrolPathsentry on the existing dashboard host and Control backend. No other host/backend is needed, and installs with explicit lists keep them. PR #474 must reconcile its chart version if it merges later.Bumps relay-webapp 0.2.7 → 0.2.8 and agent-relay 0.7.66 → 0.7.67, with the dependency lock, current requirements/release row, generated requirements doc and route golden hashes aligned. Keeps sessions-pipeline 0.8.52 and all image pins from main. The branch was merged with main; published history was preserved.
Validation used CI-pinned Helm v4.3.1+gc0d08d0, with
PATH=/tmp/infra-499/darwin-arm64:/tmp/infra-499/venv/bin:$PATH.bash scripts/ci/charts.sh static relay-webapp agent-relaybash ci/agent-relay/render.shpython3 ci/agent-relay/test_ingress_routes.py -vpython3 ci/agent-relay/test_eks_alb_ingress.py -vPATH=/tmp/infra-499/helm3/darwin-arm64:/tmp/infra-499/venv/bin:$PATH python3 ci/agent-relay/test_eks_alb_ingress.py -vbash scripts/selfhost/tests/eks-alb-ingress-test.shpython3 -m unittest discover -s ci/agent-relay/kind -p test_stack.pypython3 ci/agent-relay/test_control_webapp_names.pynode ci/self-hosted-requirements/registry.mjs render/checkbash ci/agent-relay/subdomain-golden.sh updatebash scripts/ci/version-bump.shhelm lint --strict charts/relay-webapp -f charts/relay-webapp/ci/default-values.yamlhelm lint --strict charts/agent-relay -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/eks-ingress-values.yamlshellcheck -S warning scripts/selfhost/eks-alb-ingress.sh scripts/selfhost/tests/eks-alb-ingress-test.sh scripts/selfhost/tests/run-tests.shshellcheck -S warning scripts/ci/charts.sh ci/agent-relay/render.sh scripts/selfhost/eks-alb-ingress.sh scripts/selfhost/tests/eks-alb-ingress-test.sh scripts/selfhost/tests/run-tests.shyamllint -d '{extends: relaxed, rules: {line-length: disable}}' charts/relay-webapp/Chart.yaml charts/relay-webapp/values.yaml charts/agent-relay/Chart.yaml charts/agent-relay/Chart.lock charts/agent-relay/values.yaml charts/agent-relay/values-eks.yaml docs/azure-install/ingress.yaml self-hosted/requirements.yamlhelm template ci charts/relay-webapp -n ci --no-hooks -f charts/relay-webapp/ci/default-values.yaml --show-only templates/ingress.yamlhelm template proof charts/agent-relay -n agent-relay --no-hooks -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/gcp-proof-values.yaml --show-only templates/gke-ingress.yamlhelm template proof charts/agent-relay -n agent-relay --no-hooks -f charts/agent-relay/values-gcp-proof.yaml -f charts/agent-relay/ci/eks-ingress-values.yaml --show-only templates/eks-alb-ingress.yamlThe EKS equivalence matrix covers defaults; history off/read-only; ingest explicitly on/off; a separate read API; Flows; Chief; Flows + Chief + read-only; overridden Service names/ports, name, class and namespace; a release without the backend components; explicit default and legacy path lists; malformed paths and invalid options.
Previous-head GitHub checks at
44f72809b2b112721ce54e0f3c5ad5cd672006d1: all six CI jobs passed (static, Kind, release gate, agent checks, Relaycast smoke, search worker-role Kind); Greptile and cubic passed, CodeRabbit skipped. Greptile reported no new actionable findings.Compatibility follow-up at
b5bae7ab507a5a22111d9b15c842f90081d00fec: reproduced the null-key failure, restored fallback defaults, and passed the EKS suite on Helm 3 and CI-pinned Helm 4, both chart scripts, the five-test route suite and YAML lint on the rendered null-key Ingress. Version 0.7.67 and golden hashes are unchanged. CI is rerunning for this head.The two original Greptile findings are fixed and their threads resolved: root discovery scope and inherited EKS fixture settings. The relevant self-host ingress tests pass. A previous optional full self-host suite attempt encountered macOS
stat -cincompatibility, then stalled in an unrelated mocked upgrade test with GNU stat; it was stopped. No full-suite PASS is claimed or rerun for this merge.No cluster, cloud, install, upgrade, release or tag operations were performed. Live Kind HTTP behavior, controller reconciliation and a real MCP client browser sign-in remain unproven; CI runs the Kind stack test. Keep
merge-train:holdpending the required approval.🤖 Generated with Claude Code