From f3e6c090d614da0e3f9f9d4020c3efa2cdc134a5 Mon Sep 17 00:00:00 2001 From: AedinC Date: Thu, 14 Aug 2025 11:25:26 +0100 Subject: [PATCH] OSDOCS-15837:Pruning HCP and Classic Storage books. --- modules/persistent-storage-csi-drivers-supported.adoc | 6 +++--- modules/persistent-storage-csi-efs-create-volume.adoc | 2 +- .../persistent-storage-csi-olm-operator-uninstall.adoc | 8 +++++++- modules/storage-persistent-storage-pv.adoc | 4 ++-- .../persistent-storage-csi.adoc | 2 ++ storage/understanding-persistent-storage.adoc | 5 +++++ 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index 658e2f3d2019..653eefe86d2c 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -35,9 +35,9 @@ ifndef::openshift-rosa,openshift-rosa-hcp[] 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. ==== endif::openshift-rosa,openshift-rosa-hcp[] -ifdef::openshift-rosa,,openshift-rosa-hcp,openshift-aro[] -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. -endif::openshift-rosa,,openshift-rosa-hcp,openshift-aro[] +ifdef::openshift-rosa,openshift-rosa-hcp,openshift-aro[] +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. +endif::openshift-rosa,openshift-rosa-hcp,openshift-aro[] .Supported CSI drivers and features in {product-title} [cols=",^v,^v,^v,^v,^v,^v width="100%",options="header"] diff --git a/modules/persistent-storage-csi-efs-create-volume.adoc b/modules/persistent-storage-csi-efs-create-volume.adoc index 207c12f160d4..fc80837128a5 100644 --- a/modules/persistent-storage-csi-efs-create-volume.adoc +++ b/modules/persistent-storage-csi-efs-create-volume.adoc @@ -24,7 +24,7 @@ To create and configure access to an EFS volume in AWS: + * Enter a name for the file system. -* For *Virtual Private Cloud (VPC)*, select your {product-title}'s' virtual private cloud (VPC). +* For *Virtual Private Cloud (VPC)*, select the virtual private cloud (VPC) for your {product-title} cluster. * Accept default settings for all other selections. diff --git a/modules/persistent-storage-csi-olm-operator-uninstall.adoc b/modules/persistent-storage-csi-olm-operator-uninstall.adoc index 8c1f1614454c..882817de250b 100644 --- a/modules/persistent-storage-csi-olm-operator-uninstall.adoc +++ b/modules/persistent-storage-csi-olm-operator-uninstall.adoc @@ -53,5 +53,11 @@ After uninstalling, the {FeatureName} CSI Driver Operator is no longer listed in [NOTE] ==== -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. +Before you can destroy a cluster (`openshift-install destroy cluster`), you must delete the EFS volume in AWS. +ifdef::openshift-rosa-hcp,openshift-rosa[] +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. +endif::openshift-rosa-hcp,openshift-rosa[] +ifndef::openshift-rosa-hcp,openshift-rosa[] +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. +endif::openshift-rosa-hcp,openshift-rosa[] ==== diff --git a/modules/storage-persistent-storage-pv.adoc b/modules/storage-persistent-storage-pv.adoc index aa2aeca97e87..1c20214f6432 100644 --- a/modules/storage-persistent-storage-pv.adoc +++ b/modules/storage-persistent-storage-pv.adoc @@ -45,7 +45,7 @@ ifndef::openshift-rosa,openshift-rosa-hcp[] {product-title} supports the following persistent volume plugins: endif::openshift-rosa,openshift-rosa-hcp[] ifdef::openshift-rosa,openshift-rosa-hcp[] -{product-title} (ROSA) supports the following persistent volume storage options: +{product-title} supports the following persistent volume storage options: endif::openshift-rosa,openshift-rosa-hcp[] // - GlusterFS @@ -87,7 +87,7 @@ endif::openshift-enterprise,openshift-webscale,openshift-origin[] endif::microshift[] ifdef::openshift-rosa,openshift-rosa-hcp[] -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. +{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. endif::openshift-rosa,openshift-rosa-hcp[] [id="pv-capacity_{context}"] diff --git a/storage/container_storage_interface/persistent-storage-csi.adoc b/storage/container_storage_interface/persistent-storage-csi.adoc index 0fc3e9a59149..6eda148b1537 100644 --- a/storage/container_storage_interface/persistent-storage-csi.adoc +++ b/storage/container_storage_interface/persistent-storage-csi.adoc @@ -28,6 +28,8 @@ ifdef::openshift-rosa,openshift-rosa-hcp[] [role="_additional-resources"] .Additional resources * xref:../../storage/container_storage_interface/persistent-storage-csi-aws-efs.adoc#persistent-storage-csi-aws-efs[AWS Elastic File Service CSI Driver Operator] + +* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.adoc#rosa-policy-shared-responsibility[Shared responsibilities for {product-title}] endif::openshift-rosa,openshift-rosa-hcp[] include::modules/persistent-storage-csi-dynamic-provisioning.adoc[leveloffset=+1] diff --git a/storage/understanding-persistent-storage.adoc b/storage/understanding-persistent-storage.adoc index 24414a3842f5..471886de18d7 100644 --- a/storage/understanding-persistent-storage.adoc +++ b/storage/understanding-persistent-storage.adoc @@ -21,6 +21,11 @@ ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] .Additional resources * xref:../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-rwx_persistent-storage-csi-vsphere[ReadWriteMany vSphere volume support] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] +ifdef::openshift-rosa,openshift-rosa-hcp[] +[role="_additional-resources"] +.Additional resources +* xref:../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-csi[Configuring CSI volumes] +endif::openshift-rosa,openshift-rosa-hcp[] include::modules/storage-persistent-storage-pvc.adoc[leveloffset=+1]