Skip to content

Commit 03d8f3b

Browse files
committed
restructure
1 parent aff2b74 commit 03d8f3b

File tree

8 files changed

+167
-40
lines changed

8 files changed

+167
-40
lines changed

_topic_maps/_topic_map_osd.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,16 @@ Name: Installing, accessing, and deleting OpenShift Dedicated clusters
121121
Dir: osd_install_access_delete_cluster
122122
Distros: openshift-dedicated
123123
Topics:
124-
- Name: Creating a cluster on AWS
125-
File: creating-an-aws-cluster
126-
- Name: Creating a GCP Private Service Connect enabled private cluster
127-
File: creating-a-gcp-psc-enabled-private-cluster
128124
- Name: Creating a cluster on GCP with Workload Identity Federation
129125
File: creating-a-gcp-cluster-with-workload-identity-federation
126+
- Name: Creating a GCP Private Service Connect enabled private cluster
127+
File: creating-a-gcp-psc-enabled-private-cluster
130128
- Name: Creating a cluster on GCP
131129
File: creating-a-gcp-cluster
130+
#- Name: Creating a cluster on GCP with a Red Hat cloud account
131+
# File: creating-a-gcp-cluster-redhat-account
132+
- Name: Creating a cluster on AWS
133+
File: creating-an-aws-cluster
132134
#- Name: Configuring your identity providers
133135
# File: config-identity-providers
134136
#- Name: Revoking privileges and access to an OpenShift Dedicated cluster

modules/osd-create-cluster-ccs.adoc

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ endif::osd-on-gcp[]
9090
+
9191
[NOTE]
9292
====
93-
The subscription types that are available to you depend on your {product-title} subscriptions and resource quotas. For more information, contact your sales representative or Red Hat support.
93+
The subscription types that are available to you depend on your {product-title} subscriptions and resource quotas.
94+
ifdef::osd-on-gcp[]
95+
Red Hat recommends deploying your cluster with the On-Demand subscription type purchased through the {GCP} Marketplace. This option provides flexible, consumption-based billing, consuming additional capacity is frictionless, and no Red Hat intervention is required.
96+
endif::osd-on-gcp[]
97+
For more information, contact your sales representative or Red Hat support.
9498
====
9599
+
96100
.. Select the *Customer Cloud Subscription* infrastructure type to deploy {product-title} in an existing cloud provider account that you own.
@@ -101,11 +105,11 @@ ifdef::osd-on-aws[]
101105
endif::osd-on-aws[]
102106
ifdef::osd-on-gcp[]
103107
. Select *Run on Google Cloud Platform*.
104-
. Select either *Service account* or *Workload Identity Federation* as the Authentication type.
108+
. Select *Service Account* as the Authentication type.
105109
+
106110
[NOTE]
107111
====
108-
For more information about authentication types, click the question icon located next to *Authentication type*.
112+
Red Hat recommends using Workload Identity Federation as the Authentication type. For more information, see xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster-with-workload-identity-federation.adoc#osd-creating-a-cluster-on-gcp-with-workload-identity-federation[Creating a cluster on GCP with Workload Identity Federation].
109113
====
110114
+
111115
endif::osd-on-gcp[]
@@ -129,21 +133,8 @@ Some AWS SCPs can cause the installation to fail, even if you have the required
129133
====
130134
endif::osd-on-aws[]
131135
ifdef::osd-on-gcp[]
132-
. If you selected *Service account* as the Authentication type, provide your GCP service account private key in JSON format. You can either click *Browse* to locate and attach a JSON file or add the details in the *Service account JSON* field.
133-
. If you selected *Workload Identity Federation* as the Authentication type, you will first need to create a new WIF configuration.
134-
Open a terminal window and run the following `ocm` CLI command.
135-
+
136-
[source,terminal]
137-
----
138-
$ ocm gcp create wif-config --name <wif_name> \ <1>
139-
--project <gcp_project_id> <2>
140-
----
141-
<1> Replace `<wif_name>` with the name of your WIF configuration.
142-
<2> Replace `<gcp_project_id>` with the ID of the {GCP} project where the WIF configuration will be implemented.
143-
144-
. Select a configured WIF configuration from the *WIF configuration* drop-down list. If you want to select the WIF configuration you created in the last step, click *Refresh* first.
136+
. Provide your GCP service account private key in JSON format. You can either click *Browse* to locate and attach a JSON file or add the details in the *Service account JSON* field.
145137
endif::osd-on-gcp[]
146-
147138
. Click *Next* to validate your cloud provider account and go to the *Cluster details* page.
148139

149140
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
@@ -154,9 +145,9 @@ To customize the subdomain, select the *Create customize domain prefix* checkbox
154145
.. Select a cluster version from the *Version* drop-down menu.
155146
ifdef::osd-on-gcp[]
156147
+
157-
[NOTE]
148+
[IMPORTANT]
158149
====
159-
Workload Identity Federation (WIF) is only supported on {product-title} version 4.17 and later.
150+
Clusters configured with Private Service Connect (PSC) are only supported on OpenShift Dedicated version 4.17 and later. For more information regarding PSC, see _Private Service Overview_ in the _Additional resources_ section.
160151
====
161152
+
162153
endif::osd-on-gcp[]
@@ -187,7 +178,7 @@ The key is used for encrypting all control plane, infrastructure, worker node ro
187178
+
188179
endif::osd-on-aws[]
189180
ifdef::osd-on-gcp[]
190-
... 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*.
181+
... 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*.
191182
+
192183
[IMPORTANT]
193184
====
@@ -213,18 +204,23 @@ If *Enable FIPS cryptography* is selected, *Enable additional etcd encryption* i
213204
+
214205
[NOTE]
215206
====
216-
By enabling etcd encryption for the key values in etcd, you will incur a performance overhead of approximately 20%. The overhead is a result of introducing this second layer of encryption, in addition to the default control plane storage encryption that encrypts the etcd volumes. Consider enabling etcd encryption only if you specifically require it for your use case.
207+
By enabling additional etcd encryption, you will incur a performance overhead of approximately 20%. The overhead is a result of introducing this second layer of encryption, in addition to the default control plane storage encryption that encrypts the etcd volumes. Consider enabling etcd encryption only if you specifically require it for your use case.
217208
====
218209
+
219210
.. Click *Next*.
220211

221-
. On the *Default machine pool* page, select a *Compute node instance type* and a *Compute node count*. The number and types of nodes that are available depend on your {product-title} subscription. If you are using multiple availability zones, the compute node count is per zone.
212+
. On the *Default machine pool* page, select a *Compute node instance type* from the drop-down menu.
213+
. Optional: Select the *Enable autoscaling* checkbox to enable autoscaling.
214+
.. Click *Edit cluster autoscaling settings* to make changes to the autoscaling settings.
215+
.. Once you have made your desired changes, click *Close*.
216+
.. Select a minimum and maximum node count. Node counts can be selected by engaging the available plus and minus signs or inputting the desired node count into the number input field.
217+
. Select a *Compute node count* from the drop-down menu.
222218
+
223219
[NOTE]
224220
====
225-
After your cluster is created, you can change the number of compute nodes in your cluster, but you cannot change the compute node instance type in a machine pool. The number and types of nodes available to you depend on your {product-title} subscription.
221+
If you are using multiple availability zones, the compute node count is per zone. After your cluster is created, you can change the number of compute nodes in your cluster, but you cannot change the compute node instance type in a machine pool. The number and types of nodes available to you depend on your {product-title} subscription.
226222
====
227-
223+
+
228224
ifdef::osd-on-aws[]
229225
. Choose your preference for the Instance Metadata Service (IMDS) type, either using both IMDSv1 and IMDSv2 types or requiring your EC2 instances to use only IMDSv2. You can access instance metadata from a running instance in two ways:
230226
+
@@ -244,7 +240,7 @@ IMDSv2 uses session-oriented requests. With session-oriented requests, you creat
244240
For more information regarding IMDS, see link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html[Instance metadata and user data] in the AWS documentation.
245241
endif::osd-on-aws[]
246242

247-
. Optional: Expand *Edit node labels* to add labels to your nodes. Click *Add label* to add more node labels and select *Next*.
243+
. Optional: Expand *Add node labels* to add labels to your nodes. Click *Add additional label* to add an additional node label and select *Next*.
248244
ifdef::osd-on-gcp[]
249245
+
250246
[IMPORTANT]
@@ -255,7 +251,7 @@ This step refers to labels within Kubernetes, not Google Cloud. For more informa
255251
endif::osd-on-gcp[]
256252
. On the *Network configuration* page, select *Public* or *Private* to use either public or private API endpoints and application routes for your cluster.
257253
ifdef::osd-on-gcp[]
258-
If you select *Private*, *Use Private Service Connect* is selected by default. Private Service Connect (PSC) is Google Cloud’s security-enhanced networking feature. You can disable PSC by clicking the *Use Private Service Connect* checkbox.
254+
If you select *Private* and selected {product-title} version 4.17 or later as your cluster version, *Use Private Service Connect* is selected by default. Private Service Connect (PSC) is Google Cloud’s security-enhanced networking feature. You can disable PSC by clicking the *Use Private Service Connect* checkbox.
259255
+
260256
[NOTE]
261257
====

modules/private-service-connect-create.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
= Creating a private cluster with Private Service Connect
88

99
Private Service Connect is supported with the Customer Cloud Subscription (CCS) infrastructure type only. To create an {product-title} on {GCP} using PSC, see
10-
xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster.adoc#osd-create-cluster-gcp-account_osd-creating-a-cluster-on-gcp[Creating a cluster on GCP with Google Cloud Marketplace].
10+
xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster.adoc#osd-create-gcp-cluster-ccs_osd-creating-a-cluster-on-gcp[Creating a cluster on GCP with CCS].

osd_getting_started/osd-getting-started.adoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ Complete the steps in one of the following sections to deploy {product-title} in
3535

3636
*** An {product-title} cluster deployed on {GCP} can be created in Private cluster mode, without any cloud resources. In this configuration, Red Hat uses Google Cloud Private Service Connect (PSC) to manage and monitor a cluster to avoid all public ingress network traffic. For more details, see xref:../osd_install_access_delete_cluster/creating-a-gcp-psc-enabled-private-cluster.adoc[Creating a GCP Private Service Connect enabled private cluster].
3737

38-
** For installing and interacting with the {product-title} cluster deployed on the {GCP} using the Service Account authentication type, see following topics:
39-
40-
*** *xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster.adoc#osd-create-cluster-gcp-account_osd-creating-a-cluster-on-gcp[Creating a cluster on GCP with Google Cloud Marketplace]*: You can install {product-title} in your own {GCP} account with Google Cloud Marketplace.
41-
42-
*** *xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster.adoc#osd-create-cluster-rhm-gcp-account_osd-creating-a-cluster-on-gcp[Creating a cluster on GCP with Red Hat Marketplace]*: You can install {product-title} in your own {GCP} account with Red Hat Marketplace.
38+
** For installing and interacting with the {product-title} cluster deployed on the {GCP} using the Service Account authentication type, see xref:../osd_install_access_delete_cluster/creating-a-gcp-cluster.adoc#osd-create-gcp-cluster-ccs_osd-creating-a-cluster-on-gcp[Creating a cluster on GCP].
4339

4440
[id="osd-getting-started-create-cluster-red-hat-cloud-account"]
4541
=== Creating a cluster using a Red Hat cloud account

0 commit comments

Comments
 (0)