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

[v13] Proxy Templates update: cluster switching and tsh ssh parity #26852

Merged
merged 2 commits into from May 25, 2023

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented May 24, 2023

Backport #24586 and #25286 to branch/v13

Joerger and others added 2 commits May 24, 2023 11:03
…24586)

* Update proxy templates rfd to include cluster switching section and tsh ssh section.

* Resolve comments.
* Use web address when appropriate for a jump hosts

Determines whether the jump host provided via `tsh ssh -J` is belongs
to the Proxy SSH or Web server to ensure when using jump hosts that
connections are established directly on the target cluster.

Closes #25178

* Modify tsh tests to capture issues with jump hosts

Alters the root and leaf cluster and node names used by tsh tests
so that the root cluster is named `root` instead of `localhost` and
sets a unique `NodeName` for each cluster instead of reusing
`localnode` for both. This was masking problems in jump hosts tests
by connecting to the node in the root cluster instead of the leaf
cluster.

Some additional changes to tsh tests were made as a result of
changing the cluster and node names.

* fix proxy client tests

* update TestList to login once

* * Add cluster parsing to proxy templates

* Check ProxyTemplates even if -J is not provided

* Modify proxy templates logic to work with tsh ssh

* Apply suggestions from code review

Co-authored-by: Gavin Frazar <gavin.frazar@goteleport.com>

---------

Co-authored-by: Tim Ross <tim.ross@goteleport.com>
Co-authored-by: Gavin Frazar <gavin.frazar@goteleport.com>
@github-actions github-actions bot added backport rfd Request for Discussion size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels May 24, 2023
@Joerger Joerger enabled auto-merge May 24, 2023 19:33
@Joerger Joerger added this pull request to the merge queue May 25, 2023
Merged via the queue into branch/v13 with commit 9c22bc6 May 25, 2023
30 checks passed
@Joerger Joerger deleted the joerger/v13/tsh-ssh-proxy-templates branch May 25, 2023 09:04
@r0mant r0mant mentioned this pull request Jul 14, 2023
@fheinecke fheinecke mentioned this pull request Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfd Request for Discussion size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants