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

Backport #12504 to branch/v9 #13112

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Conversation

ptgott
Copy link
Contributor

@ptgott ptgott commented Jun 2, 2022

Backport #12504 to branch/v9

@ptgott ptgott force-pushed the auto-backport/12504-to-branch/v9 branch from 75b8cff to ca3dc75 Compare June 2, 2022 17:09
@ptgott ptgott enabled auto-merge (squash) June 3, 2022 13:40
ptgott added 2 commits June 3, 2022 09:40
See: #11841

This change makes the Adding Nodes guide more usable for self-hosted
clusters based on manual testing.

- Make it clearer that you can use tctl on your local machine with
  a self-hosted cluster. For convenience, all instructions in this guide
  assume you are using tctl from a local machine.

- Misc. minor edits for clarity.

- Move different methods of using tokens into Details boxes, since
  following the guide only requires the first "tctl nodes add" command.

- Use environment variables to store the CA pin, invite token, and
  Proxy/Auth address, making it slightly more convenient to copy the
  "teleport start" command and run it on the Node.

- Turn the Node Tunneling section into a Details box below the
  instruction to assign the Auth/Proxy address to an environment
  variable, and better integrate the text into the guide. Previously,
  the Node Tunneling section also advised the reader to create
  a token, which they would have doe already at this point in the guide.
Also remove some erroneous command output
@ptgott ptgott force-pushed the auto-backport/12504-to-branch/v9 branch from ca3dc75 to 31e6773 Compare June 3, 2022 13:40
@ptgott ptgott merged commit d49b353 into branch/v9 Jun 3, 2022
@webvictim webvictim mentioned this pull request Jun 8, 2022
@ptgott ptgott deleted the auto-backport/12504-to-branch/v9 branch February 16, 2023 19:03
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.

3 participants