Skip to content

Commit 1d7a0db

Browse files
authored
Merge pull request #93040 from mletalie/OSDOCS-14568
[OSDOCS-14568]Add reference to C3 and N4 instance types in OSD docs
2 parents ed52ba9 + 2ddb549 commit 1d7a0db

File tree

3 files changed

+52
-13
lines changed

3 files changed

+52
-13
lines changed

modules/persistent-storage-csi-gcp-hyperdisk-limitations.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ The GCP PD CSI driver support for the C3 instance type for bare metal and N4 mac
1111
1212
* For cloning or resizing, hyperdisk-balanced disks original volume size must be 6Gi or greater.
1313
14-
* The default storage class is standard-csi.
14+
* The default storage class is standard-csi.
1515
+
1616
[IMPORTANT]
1717
====
1818
You need to manually create a storage class.
1919
2020
For information about creating the storage class, see Step 2 in Section _Setting up hyperdisk-balanced disks_.
2121
====
22-
22+
ifndef::openshift-dedicated[]
2323
* Clusters with mixed virtual machines (VMs) that use different storage types, for example, N2 and N4, are not supported. This is due to hyperdisks-balanced disks not being usable on most legacy VMs. Similarly, regular persistent disks are not usable on N4/C3 VMs.
24-
24+
endif::openshift-dedicated[]
2525
* A GCP cluster with c3-standard-2, c3-standard-4, n4-standard-2, and n4-standard-4 nodes can erroneously exceed the maximum attachable disk number, which should be 16 (link:https://issues.redhat.com/browse/OCPBUGS-39258[JIRA link]).

modules/persistent-storage-csi-gcp-hyperdisk-storage-pools-procedure.adoc

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,45 @@
1010
* Access to the cluster with administrative privileges
1111
1212
.Procedure
13-
To set up hyperdisk-balanced disks:
13+
Complete the following steps to set up hyperdisk-balanced disks:
14+
15+
ifdef::openshift-dedicated[]
16+
. Create an {product-title} cluster on {GCP} with attached disks provisioned with hyperdisk-balanced disks. This can be achieved by provisioning the cluster with compute node types that support hyperdisk-balanced disks, such as the C3 and N4 machine series from {GCP}.
17+
. Once the OSD cluster is ready, navigate to the **OpenShift console** for Storage Class creation.
18+
Within the console, navigate to the **Storage** section to create a Storage Class specifying the hyperdisk-balanced disk:
19+
+
20+
.Example StorageClass YAML file
21+
[source, yaml]
22+
----
23+
kind: StorageClass
24+
apiVersion: storage.k8s.io/v1
25+
metadata:
26+
name: hyperdisk-sc <1>
27+
annotations:
28+
storageclass.kubernetes.io/is-default-class: 'true'
29+
provisioner: pd.csi.storage.gke.io <2>
30+
parameters:
31+
replication-type: none
32+
storage-pools: projects/myproject/zones/us-east1-c/storagePools/hyperdisk-storagepool <3>
33+
type: hyperdisk-balanced <4>
34+
reclaimPolicy: Delete
35+
allowVolumeExpansion: true
36+
volumeBindingMode: Immediate
37+
----
38+
<1> Specify the name for your storage class. In this example, the name is `hyperdisk-sc`.
39+
<2> Specify the GCP CSI provisioner as `pd.csi.storage.gke.io`.
40+
<3> If using storage pools, specify a list of specific storage pools that you want to use in the following format: `projects/PROJECT_ID/zones/ZONE/storagePools/STORAGE_POOL_NAME`.
41+
<4> Specify the disk type as `hyperdisk-balanced`.
42+
+
43+
[NOTE]
44+
====
45+
If you use storage pools, you must first create a Hyperdisk Storage Pool of the type "Hyperdisk Balanced" in the Google Cloud console prior to referencing it in the OpenShift Storage Class. The Hyperdisk Storage Pool must be created in the same zone as the compute node supporting Hyperdisk is installed in the cluster configuration. For more information about creating a Hyperdisk Storage Pool, see link:https://cloud.google.com/compute/docs/disks/create-storage-pools#create-pool[Create a Hyperdisk Storage Pool] in the Google Cloud documentation.
46+
====
47+
48+
endif::openshift-dedicated[]
1449

1550
ifndef::openshift-dedicated[]
16-
. Create GCP cluster with attached disks provisioned with hyperdisk-balanced disks.
51+
. Create a GCP cluster with attached disks provisioned with hyperdisk-balanced disks.
1752
endif::openshift-dedicated[]
1853

1954
ifndef::openshift-dedicated[]
@@ -22,7 +57,7 @@ endif::openshift-dedicated[]
2257

2358
ifndef::openshift-dedicated[]
2459
.. Follow the procedure in the _Installing a cluster on GCP with customizations_ section.
25-
+
60+
+
2661
For your install-config.yaml file, use the following example file:
2762
+
2863
.Example install-config YAML file
@@ -74,6 +109,7 @@ ifndef::openshift-dedicated[]
74109
* cluster_csi_driver.yaml - specifies opting out of the default storage class creation
75110
* storageclass.yaml - creates a hyperdisk-specific storage class
76111
+
112+
--
77113
.Example cluster CSI driver YAML file
78114
[source, yaml]
79115
----
@@ -88,7 +124,9 @@ spec:
88124
storageClassState: Unmanaged <1>
89125
----
90126
<1> Specifies disabling creation of the default {product-title} storage classes.
127+
--
91128
+
129+
--
92130
.Example storage class YAML file
93131
[source, yaml]
94132
----
@@ -121,7 +159,8 @@ allowedTopologies: <7>
121159
<4> Specifies the throughput value in MiBps using the "Mi" qualifier. For example, if your required throughput is 250 MiBps, specify "250Mi". If you do not specify a value, the capacity is based upon the disk type default.
122160
<5> Specifies the IOPS value without any qualifiers. For example, if you require 7,000 IOPS, specify "7000". If you do not specify a value, the capacity is based upon the disk type default.
123161
<6> If using storage pools, specify a list of specific storage pools that you want to use in the format: projects/PROJECT_ID/zones/ZONE/storagePools/STORAGE_POOL_NAME.
124-
<7> If using storage pools, set `allowedTopologies` to restrict the topology of provisioned volumes to where the storage pool exists. In this example, `us-east4-c`.
162+
<7> If using storage pools, set `allowedTopologies` to restrict the topology of provisioned volumes to where the storage pool exists. In this example, `us-east4-c`.
163+
--
125164
endif::openshift-dedicated[]
126165
127166
. Create a persistent volume claim (PVC) that uses the hyperdisk-specific storage class using the following example YAML file:
@@ -245,5 +284,4 @@ $ gcloud compute storage-pools list-disks pool-us-east4-c --zone=us-east4-c
245284
----
246285
NAME STATUS PROVISIONED_IOPS PROVISIONED_THROUGHPUT SIZE_GB
247286
pvc-1ff52479-4c81-4481-aa1d-b21c8f8860c6 READY 3000 140 2048
248-
----
249-
287+
----

storage/container_storage_interface/persistent-storage-csi-gcp-pd.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[id="persistent-storage-csi-gcp-pd"]
33
= GCP PD CSI Driver Operator
44
include::_attributes/common-attributes.adoc[]
5+
include::_attributes/attributes-openshift-dedicated.adoc[]
56
:context: persistent-storage-csi-gcp-pd
67

78
toc::[]
@@ -19,15 +20,15 @@ To create CSI-provisioned persistent volumes (PVs) that mount to GCP PD storage
1920
* *GCP PD CSI Driver Operator*: By default, the Operator provides a storage class that you can use to create PVCs. You can disable this default storage class if desired (see xref:../../storage/container_storage_interface/persistent-storage-csi-sc-manage.adoc#persistent-storage-csi-sc-manage[Managing the default storage class]). You also have the option to create the GCP PD storage class as described in xref:../../storage/persistent_storage/persistent-storage-gce.adoc#persistent-storage-using-gce[Persistent storage using GCE Persistent Disk].
2021

2122
* *GCP PD driver*: The driver enables you to create and mount GCP PD PVs.
22-
ifndef::openshift-dedicated[]
23+
//
2324
+
2425
GCP PD CSI driver supports the C3 instance type for bare metal and N4 machine series. The C3 instance type and N4 machine series support the hyperdisk-balanced disks.
25-
26+
ifndef::openshift-dedicated[]
2627
[NOTE]
2728
====
2829
{product-title} provides automatic migration for the GCE Persistent Disk in-tree volume plugin to its equivalent CSI driver. For more information, see xref:../../storage/container_storage_interface/persistent-storage-csi-migration.adoc#persistent-storage-csi-migration[CSI automatic migration].
2930
====
30-
31+
endif::openshift-dedicated[]
3132

3233
[id="c3-instance-type-for-bare-metal-and-n4-machine-series"]
3334
== C3 instance type for bare metal and N4 machine series
@@ -39,7 +40,7 @@ include::modules/persistent-storage-csi-gcp-hyperdisk-storage-pools-overview.ado
3940
To set up storage pools, see xref:../../storage/container_storage_interface/persistent-storage-csi-gcp-pd.adoc#persistent-storage-csi-gcp-hyperdisk-storage-pools-procedure_persistent-storage-csi-gcp-pd[Setting up hyperdisk-balanced disks].
4041

4142
include::modules/persistent-storage-csi-gcp-hyperdisk-storage-pools-procedure.adoc[leveloffset=+2]
42-
endif::openshift-dedicated[]
43+
4344
ifndef::openshift-dedicated[]
4445
[id="resources-for-gcp-c3-n4-instances"]
4546
[role="_additional-resources"]

0 commit comments

Comments
 (0)