Skip to content

Commit 37aed0f

Browse files
authored
Merge pull request #88510 from mletalie/OSDOCS-13373
[OSDOCS-13373]Remove mention of AWS in OSD on GCP SA Docs
2 parents f6289ea + 503f9b6 commit 37aed0f

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

modules/create-wif-cluster-ocm.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ Workload Identity Federation (WIF) is only supported on {product-title} version
5555
.. Select a cloud provider region from the *Region* drop-down menu.
5656
.. Select a *Single zone* or *Multi-zone* configuration.
5757
+
58-
.. Optional: Select *Enable Secure Boot for Shielded VMs* to use Shielded VMs when installing your cluster. For more information, see link:https://cloud.google.com/security/products/shielded-vm[Shielded VMs].
58+
.. Optional: Select *Enable Secure Boot support for Shielded VMs* to use Shielded VMs when installing your cluster. For more information, see link:https://cloud.google.com/security/products/shielded-vm[Shielded VMs].
5959
+
6060
[IMPORTANT]
6161
====
6262
To successfully create a cluster, you must select *Enable Secure Boot support for Shielded VMs* if your organization has the policy constraint `constraints/compute.requireShieldedVm` enabled. For more information regarding GCP organizational policy constraints, see link:https://cloud.google.com/resource-manager/docs/organization-policy/org-policy-constraints[Organization policy constraints].
6363
====
6464
+
65+
6566
.. Leave *Enable user workload monitoring* selected to monitor your own projects in isolation from Red Hat Site Reliability Engineer (SRE) platform metrics. This option is enabled by default.
6667

6768
. Optional: Expand *Advanced Encryption* to make changes to encryption settings.

modules/osd-create-cluster-ccs.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,36 +68,36 @@ To successfully create a cluster, you must select *Enable Secure Boot support fo
6868
+
6969

7070
.. Leave *Enable user workload monitoring* selected to monitor your own projects in isolation from Red Hat Site Reliability Engineer (SRE) platform metrics. This option is enabled by default.
71-
.. Optional: Expand *Advanced Encryption* to make changes to encryption settings.
7271

73-
... Accept the default setting *Use default KMS Keys* to use your default AWS KMS key, or select *Use Custom KMS keys* to use a custom KMS key.
74-
.... With *Use Custom KMS keys* selected, enter the AWS Key Management Service (KMS) custom key Amazon Resource Name (ARN) ARN in the *Key ARN* field.
75-
The key is used for encrypting all control plane, infrastructure, worker node root volumes, and persistent volumes in your cluster.
72+
. Optional: Expand *Advanced Encryption* to make changes to encryption settings.
7673

77-
+
74+
.. Select *Use custom KMS keys* to use custom KMS keys. If you prefer not to use custom KMS keys, leave the default setting *Use default KMS Keys*.
7875

79-
... Select *Use custom KMS keys* to use custom KMS keys. If you prefer not to use custom KMS keys, leave the default setting *Use default KMS Keys*.
8076
+
77+
8178
[IMPORTANT]
8279
====
8380
To use custom KMS keys, the IAM service account `osd-ccs-admin` must be granted the *Cloud KMS CryptoKey Encrypter/Decrypter* role. For more information about granting roles on a resource, see link:https://cloud.google.com/kms/docs/iam#granting_roles_on_a_resource[Granting roles on a resource].
8481
====
85-
+
86-
With *Use Custom KMS keys* selected:
8782

88-
.... Select a key ring location from the *Key ring location* drop-down menu.
89-
.... Select a key ring from the *Key ring* drop-down menu.
90-
.... Select a key name from the *Key name* drop-down menu.
91-
.... Provide the *KMS Service Account*.
9283
+
93-
... Optional: Select *Enable FIPS cryptography* if you require your cluster to be FIPS validated.
84+
85+
.. With *Use Custom KMS keys* selected:
86+
87+
... Select a key ring location from the *Key ring location* drop-down menu.
88+
... Select a key ring from the *Key ring* drop-down menu.
89+
... Select a key name from the *Key name* drop-down menu.
90+
... Provide the *KMS Service Account*.
91+
92+
.. Optional: Select *Enable FIPS cryptography* if you require your cluster to be FIPS validated.
9493
+
9594
[NOTE]
9695
====
9796
If *Enable FIPS cryptography* is selected, *Enable additional etcd encryption* is enabled by default and cannot be disabled. You can select *Enable additional etcd encryption* without selecting *Enable FIPS cryptography*.
9897
====
9998
+
100-
... Optional: Select *Enable additional etcd encryption* if you require etcd key value encryption. With this option, the etcd key values are encrypted, but the keys are not. This option is in addition to the control plane storage encryption that encrypts the etcd volumes in {product-title} clusters by default.
99+
.. Optional: Select *Enable additional etcd encryption* if you require etcd key value encryption.
100+
With this option, the etcd key values are encrypted, but not the keys. This option is in addition to the control plane storage encryption that encrypts the etcd volumes in {product-title} clusters by default.
101101
+
102102
[NOTE]
103103
====

0 commit comments

Comments
 (0)