Skip to content

Machine ID: Documentation for Terraform Cloud joining#45806

Merged
timothyb89 merged 15 commits intomasterfrom
timothyb89/terraform-cloud-joining-docs
Sep 12, 2024
Merged

Machine ID: Documentation for Terraform Cloud joining#45806
timothyb89 merged 15 commits intomasterfrom
timothyb89/terraform-cloud-joining-docs

Conversation

@timothyb89
Copy link
Copy Markdown
Contributor

@timothyb89 timothyb89 commented Aug 24, 2024

This adds documentation for the new terraform_cloud join method.


Note: Hold off on merging this until #46051 is merged, as well as the (not yet written) PR to make public Terraform Cloud joining available in OSS.

@timothyb89
Copy link
Copy Markdown
Contributor Author

timothyb89 commented Aug 24, 2024

These docs are definitely a bit... weird. I don't think we have docs updated to reflect the embedded tbot work, and without precedent there I'm not totally sure if this is really Machine ID related, or Terraform related. My impulse is that it leans toward the latter, but existing TF provider docs are already in the Machine ID section:

Looks like #44954 already refactored the docs! I'll adjust here.

Also added a troubleshooting section
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 6, 2024

🤖 Vercel preview here: https://docs-q6xizadzj-goteleport.vercel.app/docs/ver/preview

@timothyb89 timothyb89 marked this pull request as ready for review September 6, 2024 01:49
@timothyb89 timothyb89 marked this pull request as draft September 6, 2024 01:50
@timothyb89
Copy link
Copy Markdown
Contributor Author

In light of #44954 already refactoring the Terraform docs, I'll rework this and probably move it into the Admin Guides / IaC / Terraform section now that we have a nice organizational structure to work with.

This moves the Terraform Cloud docs to the new Terraform Provider
section, and rewrites some things to account for the new changes
in other terraform provider pages, e.g. the new builtin
`terraform-provider` role.
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 7, 2024

🤖 Vercel preview here: https://docs-3fjbt4qtm-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 7, 2024

🤖 Vercel preview here: https://docs-81nnfmqqt-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 7, 2024

🤖 Vercel preview here: https://docs-oz0awiec9-goteleport.vercel.app/docs/ver/preview

@timothyb89 timothyb89 marked this pull request as ready for review September 10, 2024 00:32
@github-actions
Copy link
Copy Markdown
Contributor

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@timothyb89 timothyb89 added the no-changelog Indicates that a PR does not require a changelog entry label Sep 10, 2024
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'd pop this into https://goteleport.com/docs/reference/join-methods/ as well for completeness.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch, missed that reference.

Comment thread docs/pages/admin-guides/infrastructure-as-code/terraform-provider.mdx Outdated
Comment thread docs/pages/admin-guides/infrastructure-as-code/terraform-provider.mdx Outdated

To start, the Teleport Auth Service needs to be configured to accept join
requests from Terraform Cloud runs. We'll do this by creating
[a bot](../../../reference/architecture/machine-id-architecture.mdx#what-is-a-bot)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since this link isn't required to complete Step 1, I would move it to a "Further reading" section or delete it (per the style guide: https://github.com/gravitational/docs/blob/main/docs-contributors/style-guide.md#using-links-admonishments-and-details-in-how-to-guides).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fair enough, I'll remove it. The inner workings are mostly irrelevant now that all the Machine ID-y internals are built in to the Terraform Provider.

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>
@github-actions
Copy link
Copy Markdown
Contributor

🤖 Vercel preview here: https://docs-gzntdqkfk-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

🤖 Vercel preview here: https://docs-dg7bv7402-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

🤖 Vercel preview here: https://docs-npz4uxgtr-goteleport.vercel.app/docs/ver/preview

@timothyb89 timothyb89 added this pull request to the merge queue Sep 12, 2024
Merged via the queue into master with commit 0871d57 Sep 12, 2024
@timothyb89 timothyb89 deleted the timothyb89/terraform-cloud-joining-docs branch September 12, 2024 02:47
timothyb89 added a commit that referenced this pull request Sep 17, 2024
* Machine ID: Documentation for Terraform Cloud joining

* Various verbiage changes; include Terraform Enterprise

Also added a troubleshooting section

* Link to new guide from existing terraform provider page

* Move to the new Terraform Provider section

This moves the Terraform Cloud docs to the new Terraform Provider
section, and rewrites some things to account for the new changes
in other terraform provider pages, e.g. the new builtin
`terraform-provider` role.

* Fix docs lints

* Fix more docs lints

* Fix docs lints

* Fix even more docs lints

* Apply suggestions from code review

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>

* Address review feedback: include in join method reference, add links

* Fix codeblock spacing

* Fix broken heading link

---------

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>
github-merge-queue Bot pushed a commit that referenced this pull request Sep 19, 2024
* Machine ID: Documentation for Terraform Cloud joining (#45806)

* Machine ID: Documentation for Terraform Cloud joining

* Various verbiage changes; include Terraform Enterprise

Also added a troubleshooting section

* Link to new guide from existing terraform provider page

* Move to the new Terraform Provider section

This moves the Terraform Cloud docs to the new Terraform Provider
section, and rewrites some things to account for the new changes
in other terraform provider pages, e.g. the new builtin
`terraform-provider` role.

* Fix docs lints

* Fix more docs lints

* Fix docs lints

* Fix even more docs lints

* Apply suggestions from code review

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>

* Address review feedback: include in join method reference, add links

* Fix codeblock spacing

* Fix broken heading link

---------

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>

* Update Terraform Cloud joining minimum version (#46579)

* Update Terraform Cloud joining minimum version

This updates the minimum required Teleport version for TF Cloud
joining, and adds a note about Enterprise joining being in Preview.

* Remove preview note per feedback

* Fix example token in the Terraform Cloud joining docs (#46693)

The `terraform` provision token field was renamed to `terraform_cloud`
and this change was not reflected in the docs.

---------

Co-authored-by: Paul Gottschling <paul.gottschling@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation no-changelog Indicates that a PR does not require a changelog entry size/md

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants