Merge pull request #70251 from lpettyjo/OSDOCS-9316_GCE

OSDOCS#9316:Correct GCE in-tree migration info

Author: lpettyjo

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

@@ -20,10 +20,12 @@ To create CSI-provisioned persistent volumes (PVs) that mount to GCP PD storage
 
 * *GCP PD driver*: The driver enables you to create and mount GCP PD PVs.
 
-[IMPORTANT]
+ifndef::openshift-dedicated[]
+[NOTE]
 ====
-{product-title} defaults to using the CSI plugin to provision GCP PD storage.
+{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].
 ====
+endif::openshift-dedicated[]
 
 include::modules/persistent-storage-csi-about.adoc[leveloffset=+1]
 

storage/persistent_storage/persistent-storage-gce.adoc

@@ -23,17 +23,16 @@ they can be shared across the {product-title} cluster.
 Persistent volume claims are specific to a project or namespace and can be
 requested by users.
 
+ifndef::openshift-dedicated[]
 [IMPORTANT]
 ====
-{product-title} defaults to using an in-tree (non-CSI) plugin to provision gcePD storage.
+{product-title} 4.12 and later provides automatic migration for the GCE Persist Disk in-tree volume plugin to its equivalent CSI driver.
 
-In future {product-title} versions, volumes provisioned using existing in-tree plug-ins are planned for migration to their equivalent CSI driver. CSI automatic migration should be seamless. Migration does not change how you use all existing API objects, such as persistent volumes, persistent volume claims, and storage classes.
-ifndef::openshift-dedicated[]
-For more information about migration, see xref:../../storage/container_storage_interface/persistent-storage-csi-migration.adoc#persistent-storage-csi-migration[CSI automatic migration].
-endif::openshift-dedicated[]
+CSI automatic migration should be seamless. Migration does not change how you use all existing API objects, such as persistent volumes, persistent volume claims, and storage classes.
 
-After full migration, in-tree plugins will eventually be removed in future versions of {product-title}.
+For more information about migration, see xref:../../storage/container_storage_interface/persistent-storage-csi-migration.adoc#persistent-storage-csi-migration[CSI automatic migration].
 ====
+endif::openshift-dedicated[]
 
 [IMPORTANT]
 ====