Skip to content

Commit 2874575

Browse files
authored
Merge pull request #97581 from AedinC/OSDOCS-15837
OSDOCS-15837:Pruning HCP and Classic Storage books.
2 parents 8cddd20 + da6ad41 commit 2874575

6 files changed

+20
-7
lines changed

modules/persistent-storage-csi-drivers-supported.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ ifndef::openshift-rosa,openshift-rosa-hcp[]
3535
If your CSI driver is not listed in the following table, you must follow the installation instructions provided by your CSI storage vendor to use their supported CSI features.
3636
====
3737
endif::openshift-rosa,openshift-rosa-hcp[]
38-
ifdef::openshift-rosa,,openshift-rosa-hcp,openshift-aro[]
39-
In addition to the drivers listed in the following table, ROSA functions with CSI drivers from third-party storage vendors. Red Hat does not oversee third-party provisioners or the connected CSI drivers and the vendors fully control source code, deployment, operation, and Kubernetes compatibility. These volume provisioners are considered customer-managed and the respective vendors are responsible for providing support. See the link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.html#rosa-policy-responsibilities_rosa-policy-responsibility-matrix[Shared responsibilities for {product-title}] matrix for more information.
40-
endif::openshift-rosa,,openshift-rosa-hcp,openshift-aro[]
38+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-aro[]
39+
In addition to the drivers listed in the following table, {product-title} functions with CSI drivers from third-party storage vendors. Red Hat does not oversee third-party provisioners or the connected CSI drivers and the vendors fully control source code, deployment, operation, and Kubernetes compatibility. These volume provisioners are considered customer-managed and the respective vendors are responsible for providing support. For more information, see the _Shared responsibilities for {product-title}_ in the _Additional resources_ section.
40+
endif::openshift-rosa,openshift-rosa-hcp,openshift-aro[]
4141

4242
.Supported CSI drivers and features in {product-title}
4343
[cols=",^v,^v,^v,^v,^v,^v width="100%",options="header"]

modules/persistent-storage-csi-efs-create-volume.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To create and configure access to an EFS volume in AWS:
2424
+
2525
* Enter a name for the file system.
2626

27-
* For *Virtual Private Cloud (VPC)*, select your {product-title}'s' virtual private cloud (VPC).
27+
* For *Virtual Private Cloud (VPC)*, select the virtual private cloud (VPC) for your {product-title} cluster.
2828
2929
* Accept default settings for all other selections.
3030

modules/persistent-storage-csi-olm-operator-uninstall.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,11 @@ After uninstalling, the {FeatureName} CSI Driver Operator is no longer listed in
5353

5454
[NOTE]
5555
====
56-
Before you can destroy a cluster (`openshift-install destroy cluster`), you must delete the EFS volume in AWS. An {product-title} cluster cannot be destroyed when there is an EFS volume that uses the cluster's VPC. Amazon does not allow deletion of such a VPC.
56+
Before you can destroy a cluster (`openshift-install destroy cluster`), you must delete the EFS volume in AWS.
57+
ifdef::openshift-rosa-hcp,openshift-rosa[]
58+
A {product-title} cluster cannot be destroyed when there is an EFS volume that uses the cluster's VPC. Amazon does not allow deletion of such a VPC.
59+
endif::openshift-rosa-hcp,openshift-rosa[]
60+
ifndef::openshift-rosa-hcp,openshift-rosa[]
61+
An {product-title} cluster cannot be destroyed when there is an EFS volume that uses the cluster's VPC. Amazon does not allow deletion of such a VPC.
62+
endif::openshift-rosa-hcp,openshift-rosa[]
5763
====

modules/storage-persistent-storage-pv.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ifndef::openshift-rosa,openshift-rosa-hcp[]
4545
{product-title} supports the following persistent volume plugins:
4646
endif::openshift-rosa,openshift-rosa-hcp[]
4747
ifdef::openshift-rosa,openshift-rosa-hcp[]
48-
{product-title} (ROSA) supports the following persistent volume storage options:
48+
{product-title} supports the following persistent volume storage options:
4949
endif::openshift-rosa,openshift-rosa-hcp[]
5050

5151
// - GlusterFS
@@ -87,7 +87,7 @@ endif::openshift-enterprise,openshift-webscale,openshift-origin[]
8787
endif::microshift[]
8888

8989
ifdef::openshift-rosa,openshift-rosa-hcp[]
90-
ROSA functions with Kubernetes Container Storage Interface (CSI) compatible volume provisioners from other storage vendors. See link:https://docs.openshift.com/rosa/storage/container_storage_interface/persistent-storage-csi.html[Configuring CSI volumes] for more information about CSI drivers in ROSA.
90+
{product-title} functions with Kubernetes Container Storage Interface (CSI) compatible volume provisioners from other storage vendors. For more information about CSI drivers in {product-title}, see _Configuring CSI volumes_ in the _Additional resources_ section.
9191
endif::openshift-rosa,openshift-rosa-hcp[]
9292

9393
[id="pv-capacity_{context}"]

storage/container_storage_interface/persistent-storage-csi.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ifdef::openshift-rosa,openshift-rosa-hcp[]
2828
[role="_additional-resources"]
2929
.Additional resources
3030
* xref:../../storage/container_storage_interface/persistent-storage-csi-aws-efs.adoc#persistent-storage-csi-aws-efs[AWS Elastic File Service CSI Driver Operator]
31+
32+
* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.adoc#rosa-policy-shared-responsibility[Shared responsibilities for {product-title}]
3133
endif::openshift-rosa,openshift-rosa-hcp[]
3234
3335
include::modules/persistent-storage-csi-dynamic-provisioning.adoc[leveloffset=+1]

storage/understanding-persistent-storage.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
2121
.Additional resources
2222
* xref:../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-rwx_persistent-storage-csi-vsphere[ReadWriteMany vSphere volume support]
2323
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
24+
ifdef::openshift-rosa,openshift-rosa-hcp[]
25+
[role="_additional-resources"]
26+
.Additional resources
27+
* xref:../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-csi[Configuring CSI volumes]
28+
endif::openshift-rosa,openshift-rosa-hcp[]
2429
2530
include::modules/storage-persistent-storage-pvc.adoc[leveloffset=+1]
2631

0 commit comments

Comments
 (0)