Skip to content

feat: support teleport deployment and stage image in x-deploy#1138

Open
AlexKaravaev wants to merge 3 commits into
mainfrom
alex/support-stage-teleport-in-deploy
Open

feat: support teleport deployment and stage image in x-deploy#1138
AlexKaravaev wants to merge 3 commits into
mainfrom
alex/support-stage-teleport-in-deploy

Conversation

@AlexKaravaev

Copy link
Copy Markdown
Contributor

This allows to:

  • deploy over teleport, not only ssh
  • use stage image as it's read-only and we need to mount /tmp there

@AlexKaravaev AlexKaravaev requested a review from a team as a code owner April 2, 2026 12:14

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

Copy link
Copy Markdown

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: 483c702493

ℹ️ 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".

Comment thread xtask/src/cmd/deploy.rs
}
}

target.contains('.') || target.contains(':')

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Treat bare hostnames as SSH targets

looks_like_ssh_target only returns true when the target contains . or :, so valid SSH hostnames like localhost, orb-dev, or /etc/hosts aliases are misclassified as Teleport targets. In those cases resolve_remote_target calls tsh ls -v and fails to resolve instead of using SSH, which is a regression from the previous behavior where deploy always used SSH for the provided host string.

Useful? React with 👍 / 👎.

@AlexKaravaev

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 1, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved. Merged main into the branch and resolved the conflict in xtask/src/cmd/deploy.rs by combining both sides:

  • From main: --bin flag on Args, deploy_bin function, get_crate_binary_name
  • From HEAD: teleport/stage deploy support, deploy_deb with SSH+Teleport routing, get_package_deploy_info, bind-mount helpers

cargo check -p x passes cleanly. Merge commit: 947622e

@AlexKaravaev

Copy link
Copy Markdown
Contributor Author

@copilot fix clippy

Copilot AI commented Jul 1, 2026

Copy link
Copy Markdown

@copilot fix clippy

Fixed in the latest commit. Two collapsible_if lints in looks_like_ssh_target and normalize_teleport_query were collapsed using if let ... && ... chaining. cargo clippy -p x --all-targets -- -D warnings now passes cleanly.

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.

3 participants