Skip to content

fix: route terminal websocket by operate node#12676

Merged
ssongliu merged 1 commit intodev-v2from
fix/terminal-operate-node-routing
May 7, 2026
Merged

fix: route terminal websocket by operate node#12676
ssongliu merged 1 commit intodev-v2from
fix/terminal-operate-node-routing

Conversation

@ssongliu
Copy link
Copy Markdown
Member

@ssongliu ssongliu commented May 7, 2026

Refs #12677

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented May 7, 2026

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented May 7, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zhengkunwang223 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7a8b54c2b2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

const endpoint = endpoint_.replace(/^\/+/, '');
let conn = `${protocol}://${host}/${endpoint}?cols=${term.value.cols}&rows=${term.value.rows}&${args}&operateNode=${globalStore.currentNode}`;
if (args.indexOf('&operateNode=') !== -1) {
let node = args.indexOf('id=') !== -1 ? 'local' : globalStore.currentNode;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Narrow host-terminal detection to exact id query key

Using args.indexOf('id=') treats any parameter containing that substring as a host-terminal session and forces operateNode=local. This now misroutes non-host terminals such as container exec requests that use containerid=... (for example in frontend/src/views/website/runtime/components/terminal.vue and frontend/src/components/terminal/database.vue), so in multi-node deployments those WebSocket sessions are sent to the local node instead of the active node unless each caller manually adds operateNode. Please match the standalone id key (e.g., query parsing or a stricter pattern) rather than a raw substring.

Useful? React with 👍 / 👎.

@ssongliu ssongliu merged commit 73530bb into dev-v2 May 7, 2026
4 of 5 checks passed
@ssongliu ssongliu deleted the fix/terminal-operate-node-routing branch May 7, 2026 10:28
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