docs: update hsm/kms and machine-id (#46906)

* docs: update hsm/kms and machine-id * docs: update verbiage on hsm warning * docs: spelling fix * docs: lint fix --------- Co-authored-by: Steven Martin <stevenmartin@Stevens-MacBook-Pro.local>
gravitational · Sep 25, 2024 · 9348fa5 · 9348fa5
1 parent 724c9e7
commit 9348fa5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/docs/pages/admin-guides/deploy-a-cluster/aws-kms.mdx b/docs/pages/admin-guides/deploy-a-cluster/aws-kms.mdx
@@ -30,12 +30,12 @@ learn more.
 The features documented on this page are available in Teleport `15.0.0` and
 higher.
 
-(!docs/pages/includes/commercial-prereqs-tabs.mdx!)
-
+- Teleport v(=teleport.version=) Enterprise (self-hosted).
 - (!docs/pages/includes/tctl.mdx!)
-
 - An AWS account.
 
+(!docs/pages/includes/enterprise/hsm-warning.mdx!)
+
 ## Step 1/3. Configure AWS IAM permissions
 
 Your Teleport Auth Service will need permissions to create, sign with, list,

diff --git a/docs/pages/admin-guides/deploy-a-cluster/gcp-kms.mdx b/docs/pages/admin-guides/deploy-a-cluster/gcp-kms.mdx
@@ -27,15 +27,12 @@ learn more.
 
 ## Prerequisites
 
-The features documented on this page are available in Teleport `11.1.0` and
-higher.
-
-(!docs/pages/includes/commercial-prereqs-tabs.mdx!)
-
+- Teleport v(=teleport.version=) Enterprise (self-hosted).
 - (!docs/pages/includes/tctl.mdx!)
-
 - A Google Cloud account.
 
+(!docs/pages/includes/enterprise/hsm-warning.mdx!)
+
 ## Step 1/5. Create a key ring in GCP
 
 Each Teleport Auth Server will need to be configured to use a GCP key ring

diff --git a/docs/pages/admin-guides/deploy-a-cluster/hsm.mdx b/docs/pages/admin-guides/deploy-a-cluster/hsm.mdx
@@ -14,10 +14,7 @@ hardware security module (HSM) to store and handle private keys.
 - An HSM reachable from your Teleport auth server.
 - The PKCS#11 module for your HSM.
 
-<Admonition type="warning" scope={["cloud", "oss"]} opened={true} scopeOnly={true} title="Compatibility Warning">
-Teleport Cloud and Teleport Open Source do not currently support HSM.
-
-</Admonition>
+(!docs/pages/includes/enterprise/hsm-warning.mdx!)
 
 While most PKCS#11 HSMs should be supported, the Teleport team tests with AWS
 CloudHSM, YubiHSM2, and SoftHSM2.

diff --git a/docs/pages/enroll-resources/machine-id/deployment/github-actions.mdx b/docs/pages/enroll-resources/machine-id/deployment/github-actions.mdx
@@ -68,7 +68,7 @@ to more accurately describe your use-case.
 <Admonition type="note" title="Using GitHub Enterprise?">
 **Enterprise Server**
 
-From Teleport 11.1.4, users with Teleport Enterprise are able to permit
+If you are using self-hosted Teleport Enterprise you are able to permit
 workflows within GitHub Enterprise Server instances to authenticate using the
 GitHub join method.
 

diff --git a/docs/pages/includes/enterprise/hsm-warning.mdx b/docs/pages/includes/enterprise/hsm-warning.mdx
@@ -0,0 +1,5 @@
+<Admonition type="warning" opened={true} scopeOnly={true} title="Compatibility Warning">
+Teleport Cloud and Teleport Open Source do not currently support HSMs or 
+Key Management Services.
+
+</Admonition>