-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Machine ID: Leaf cluster support for SSH multiplexer #43484
Merged
strideynet
merged 8 commits into
master
from
strideynet/ssh-multiplexer-multi-cluster-support
Jun 28, 2024
Merged
Machine ID: Leaf cluster support for SSH multiplexer #43484
strideynet
merged 8 commits into
master
from
strideynet/ssh-multiplexer-multi-cluster-support
Jun 28, 2024
+107
−55
Conversation
This file contains 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
…iplexer-multi-cluster-support
…iplexer-multi-cluster-support
flyinghermit
approved these changes
Jun 27, 2024
timothyb89
approved these changes
Jun 27, 2024
@strideynet See the table below for backport results.
|
strideynet
added a commit
that referenced
this pull request
Jun 28, 2024
* Start hacking on multicluster support for ssh multiplexer * Support specifying cluster name via multiplexing request * Generate known_hosts and ssh_config with multiple clusters * Remove unnecessary parameter * Test for specified and unspecified cluster name * Clarify comment
strideynet
added a commit
that referenced
this pull request
Jun 28, 2024
* Start hacking on multicluster support for ssh multiplexer * Support specifying cluster name via multiplexing request * Generate known_hosts and ssh_config with multiple clusters * Remove unnecessary parameter * Test for specified and unspecified cluster name * Clarify comment
This was referenced Jun 28, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 28, 2024
…43635) * Machine ID: Leaf cluster support for SSH multiplexer (#43484) * Start hacking on multicluster support for ssh multiplexer * Support specifying cluster name via multiplexing request * Generate known_hosts and ssh_config with multiple clusters * Remove unnecessary parameter * Test for specified and unspecified cluster name * Clarify comment * Remove unnecessary ctx arg
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 28, 2024
* Start hacking on multicluster support for ssh multiplexer * Support specifying cluster name via multiplexing request * Generate known_hosts and ssh_config with multiple clusters * Remove unnecessary parameter * Test for specified and unspecified cluster name * Clarify comment
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.
Closes #43477
Modifies the SSH multiplexer protocol to support specifying a target cluster and modifies the generation of the known_hosts and ssh_config to include all accessible clusters.
The additional "|cluster" suffix added to the protocol is optional - if omitted the old behaviour of using the cluster that the bot has authenticated is used. This means that using a ssh_config generated by a previous version with a newer version of tbot will not result in an error.
However, the opposite is not true. Using a ssh_config generated by a newer tbot with an older tbot's tunnel will result in an error:
We could roll to a
v2.sock
to make this error a little clearer since the socket wouldn't exist, but, they'd still get an error. Given that thessh_config
is generated by thetbot
that hosts the tunnel, the only scenario where this could be encountered is if the user maintains a custom ssh_config and starts using cluster targetting with an older version of tbot. Additionally, the SSH multiplexer has only existed for 1 or 2 patch versions. This makes it feel to me like it's not worth rolling tov2.sock
- but let me know your thoughts.changelog: Added support for dialling leaf clusters to the
tbot
SSH multiplexer