Merge branch 'branch/v9' into jim/v9/sqlbk

gravitational · Apr 4, 2022 · 97c852b · 97c852b
2 parents 0cf25b5 + 0af5852
commit 97c852b
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/docs/img/machine-id/jenkins.png b/docs/img/machine-id/jenkins.png
diff --git a/docs/pages/machine-id/getting-started.mdx b/docs/pages/machine-id/getting-started.mdx
@@ -21,6 +21,21 @@ Teleport Cloud account.
 If you have not set up a Teleport cluster before, follow the
 [Getting started](https://goteleport.com/docs/getting-started) guide.
 
+<Admonition type="note" title="Machine ID and TLS Routing">
+TLS Routing support will be added to Machine ID in [Teleport
+9.1](https://goteleport.com/docs/preview/upcoming-releases/#teleport-91). Until
+that time, the Teleport Proxy Server will need to be configured with a
+dedicated SSH listener.
+
+```yaml
+version: v1
+proxy_service:
+  enabled: "yes"
+  listen_addr: "0.0.0.0:3023"
+  ...
+```
+</Admonition>
+
 ## Step 1/4. Download and install Teleport (=teleport.version=)
 
 In this step, you will be downloading and installing Teleport binaries onto the

diff --git a/docs/pages/machine-id/guides/ansible.mdx b/docs/pages/machine-id/guides/ansible.mdx
@@ -15,6 +15,21 @@ You will need the following tools to use Teleport with Ansible.
 - `ansible` >= (=ansible.min_version=)
 - Optional tool `jq` to process `JSON` output
 
+<Admonition type="note" title="Machine ID and TLS Routing">
+TLS Routing support will be added to Machine ID in [Teleport
+9.1](https://goteleport.com/docs/preview/upcoming-releases/#teleport-91). Until
+that time, the Teleport Proxy Server will need to be configured with a
+dedicated SSH listener.
+
+```yaml
+version: v1
+proxy_service:
+  enabled: "yes"
+  listen_addr: "0.0.0.0:3023"
+  ...
+```
+</Admonition>
+
 In addition, if you already have not done so, follow the
 [Machine ID Getting Started Guide](../getting-started.mdx) to create a bot
 user and start Machine ID.

diff --git a/docs/pages/machine-id/guides/jenkins.mdx b/docs/pages/machine-id/guides/jenkins.mdx
@@ -19,6 +19,21 @@ You will need the following tools to use Teleport with Jenkins.
 - Jenkins
 - The `tctl` admin tool version >= (=teleport.version=)
 
+<Admonition type="note" title="Machine ID and TLS Routing">
+TLS Routing support will be added to Machine ID in [Teleport
+9.1](https://goteleport.com/docs/preview/upcoming-releases/#teleport-91). Until
+that time, the Teleport Proxy Server will need to be configured with a
+dedicated SSH listener.
+
+```yaml
+version: v1
+proxy_service:
+  enabled: "yes"
+  listen_addr: "0.0.0.0:3023"
+  ...
+```
+</Admonition>
+
 (!docs/pages/includes/tctl.mdx!)
 
 ## Architecture
@@ -54,6 +69,10 @@ scope for server access, reduce the blast radius if one pipeline is
 compromised, and allow you to remotely audit and lock pipelines if you detect
 malicious behavior.
 
+<Figure align="left" bordered caption="Jenkins Deployments">
+  ![Jenkins Deployments](../../../img/machine-id/jenkins.png)
+</Figure>
+
 ## Step 1/2 Configure and start Machine ID
 
 First, determine which role(s) you would like to assign to Machine ID running

diff --git a/docs/pages/machine-id/introduction.mdx b/docs/pages/machine-id/introduction.mdx
@@ -13,6 +13,9 @@ role-based access controls and audit.
 Some of the things you can do with Machine ID:
 
 - Machines can retrieve short-lived SSH certificates for CI/CD pipelines.
+- Machines can retrieve short-lived X.509 certificates for use with databases
+  or applications. [Coming in Teleport
+9.1](https://goteleport.com/docs/preview/upcoming-releases/#teleport-91).
 - Configure role-based access controls and locking for machines.
 - Capture access events in the audit log.