diff --git a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc index 7e702d2b5c..cd0e73dc26 100644 --- a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc +++ b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc @@ -38,9 +38,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vmc/installing-restricted-networks-vmc.adoc b/installing/installing_vmc/installing-restricted-networks-vmc.adoc index 1344483343..28d23ca151 100644 --- a/installing/installing_vmc/installing-restricted-networks-vmc.adoc +++ b/installing/installing_vmc/installing-restricted-networks-vmc.adoc @@ -38,9 +38,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vmc/installing-vmc-customizations.adoc b/installing/installing_vmc/installing-vmc-customizations.adoc index 4e17d22d4d..bc9c66365f 100644 --- a/installing/installing_vmc/installing-vmc-customizations.adoc +++ b/installing/installing_vmc/installing-vmc-customizations.adoc @@ -31,9 +31,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc b/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc index d86901dde7..23ad69a795 100644 --- a/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc +++ b/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc @@ -26,9 +26,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vmc/installing-vmc-network-customizations.adoc b/installing/installing_vmc/installing-vmc-network-customizations.adoc index e63e0e0821..f343cc6a21 100644 --- a/installing/installing_vmc/installing-vmc-network-customizations.adoc +++ b/installing/installing_vmc/installing-vmc-network-customizations.adoc @@ -31,9 +31,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vmc/installing-vmc-user-infra.adoc b/installing/installing_vmc/installing-vmc-user-infra.adoc index 70758d0fa3..4a2279ab54 100644 --- a/installing/installing_vmc/installing-vmc-user-infra.adoc +++ b/installing/installing_vmc/installing-vmc-user-infra.adoc @@ -29,9 +29,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vmc/installing-vmc.adoc b/installing/installing_vmc/installing-vmc.adoc index 8c6a0f9b8a..2116e814af 100644 --- a/installing/installing_vmc/installing-vmc.adoc +++ b/installing/installing_vmc/installing-vmc.adoc @@ -29,9 +29,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vmc/preparing-to-install-on-vmc.adoc b/installing/installing_vmc/preparing-to-install-on-vmc.adoc index 2dbc6f12f3..f3019521c7 100644 --- a/installing/installing_vmc/preparing-to-install-on-vmc.adoc +++ b/installing/installing_vmc/preparing-to-install-on-vmc.adoc @@ -57,6 +57,13 @@ User-provisioned infrastructure requires the user to provision all resources req include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources + +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. + [id="method-to-uninstall-ocp-on-vmc"] == Uninstalling an installer-provisioned infrastructure installation of {product-title} on VMC diff --git a/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc index 9f0d3b8d98..bc41a3572f 100644 --- a/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc @@ -35,9 +35,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc index bd6fe796cd..9db6410b0c 100644 --- a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc @@ -41,9 +41,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc index 24cb86e793..354a68931a 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc @@ -27,9 +27,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc index 33e76db3c3..65f8690735 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc @@ -30,9 +30,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc index 7e92044837..bf619ea27c 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc @@ -28,9 +28,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc index 857d287be9..66dedfba95 100644 --- a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc @@ -33,9 +33,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vsphere/installing-vsphere.adoc b/installing/installing_vsphere/installing-vsphere.adoc index d9248ed81c..1852007db6 100644 --- a/installing/installing_vsphere/installing-vsphere.adoc +++ b/installing/installing_vsphere/installing-vsphere.adoc @@ -32,9 +32,12 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1] include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. * To update the hardware version for your vSphere nodes, see xref:../../updating/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere]. [id="installation-requirements-user-infra_{context}"] diff --git a/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc b/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc index e2af3963aa..a8f3f5bf32 100644 --- a/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc +++ b/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc @@ -56,6 +56,13 @@ User-provisioned infrastructure requires the user to provision all resources req include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources + +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. + == Uninstalling an installer-provisioned infrastructure installation of {product-title} on vSphere * **xref:../../installing/installing_vsphere/uninstalling-cluster-vsphere-installer-provisioned.adoc#uninstalling-cluster-vsphere-installer-provisioned[Uninstalling a cluster on vSphere that uses installer-provisioned infrastructure]**: You can remove a cluster that you deployed on VMware vSphere infrastructure that used installer-provisioned infrastructure. diff --git a/modules/installation-vsphere-infrastructure.adoc b/modules/installation-vsphere-infrastructure.adoc index 120a07ed6b..bac4985006 100644 --- a/modules/installation-vsphere-infrastructure.adoc +++ b/modules/installation-vsphere-infrastructure.adoc @@ -91,9 +91,6 @@ you install {product-title}. You must ensure that the time on your ESXi hosts is synchronized before you install {product-title}. See link:https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.vcenterhost.doc/GUID-8756D419-A878-4AE0-9183-C6D5A91A8FB1.html[Edit Time Configuration for a Host] in the VMware documentation. ==== -[id="vsphere-csi-driver-requirements_{context}"] -include::snippets/vmware-csi-driver-reqs.adoc[] - ifeval::["{context}" == "installing-restricted-networks-vmc"] :!vmc: endif::[] diff --git a/modules/vmware-csi-driver-reqs.adoc b/modules/vmware-csi-driver-reqs.adoc new file mode 100644 index 0000000000..b61f9b8420 --- /dev/null +++ b/modules/vmware-csi-driver-reqs.adoc @@ -0,0 +1,31 @@ +// Module included in the following assemblies: +// +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-vsphere.adoc +// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc +// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc +// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc +// * installing/installing_vsphere/preparing-to-install-on-vsphere.adoc +// * installing/installing_vmc/installing-restricted-networks-vmc.adoc +// * installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc +// * installing/installing_vmc/installing-vmc-user-infra.adoc +// * installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc +// * installing/installing_vmc/installing-vmc.adoc +// * installing/installing_vmc/installing-vmc-customizations.adoc +// * installing/installing_vmc/installing-vmc-network-customizations.adoc +// * installing/installing_vmc/preparing-to-install-on-vmc.adoc +// * storage/container_storage_interface/persistent-storage-csi-vsphere.adoc + +:_content-type: CONCEPT +[id="vsphere-csi-driver-reqs_{context}"] += VMware vSphere CSI Driver Operator requirements + +The following requirements must be met in order to install the CSI Driver Operator: + +* VMware vSphere version 6.7U3 or later +* Virtual machines of hardware version 15 or later +* No third-party CSI driver already installed in the cluster + +If a third-party CSI driver is present in the cluster, {product-title} does not overwrite it. The presence of a third-party CSI driver prevents {product-title} from upgrading to 4.11. diff --git a/snippets/vmware-csi-driver-reqs.adoc b/snippets/vmware-csi-driver-reqs.adoc deleted file mode 100644 index abb406c72d..0000000000 --- a/snippets/vmware-csi-driver-reqs.adoc +++ /dev/null @@ -1,11 +0,0 @@ -:_content-type: SNIPPET - -= VMware vSphere CSI Driver Operator requirements - -The following requirements must be met in order to install the CSI Driver Operator: - -* VMware vSphere version 6.7U3 or later -* Virtual machines of hardware version 15 or later -* No third-party CSI driver already installed in the cluster - -If a third-party CSI driver is present in the cluster, {product-title} does not overwrite it. The presence of a third-party CSI driver prevents {product-title} from upgrading to 4.11. For more information about removing a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a non-Red Hat vSphere CSI Operator Driver]. diff --git a/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc b/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc index 95f4f80c7d..3b627f46b2 100644 --- a/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc +++ b/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc @@ -36,8 +36,12 @@ include::modules/persistent-storage-csi-about.adoc[leveloffset=+1] include::modules/persistent-storage-csi-vsphere-stor-policy.adoc[leveloffset=+1] -[id="vsphere-csi-driver-requirements_{context}"] -include::snippets/vmware-csi-driver-reqs.adoc[leveloffset=+1] +include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources + +* To remove a third-party CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver]. include::modules/persistent-storage-csi-vsphere-install-issues.adoc[leveloffset=+1]