OSDOCS-11706# Google Filestore auto delete resources

Author: Lisa Pettyjohn

modules/persistent-storage-csi-google-cloud-file-delete-instances.adoc

@@ -3,25 +3,20 @@
 // * storage/container_storage_interface/persistent-storage-csi-google-cloud-file.adoc
 
 :_mod-docs-content-type: PROCEDURE
-[id="persistent-storage-csi-gcp-cloud-file-delete-instances_{context}"]
+[id="persistent-storage-csi-google-cloud-file-delete-instances_{context}"]
 = Destroying clusters and GCP Filestore
 
-Typically, if you destroy a cluster, the {product-title} installer deletes all of the cloud resources that belong to that cluster. However, when a cluster is destroyed, Google Compute Platform (GCP) Filestore instances are not automatically deleted, so you must manually delete all persistent volume claims (PVCs) that use the Filestore storage class before destroying the cluster.
+Typically, if you destroy a cluster, the {product-title} installer deletes all of the cloud resources that belong to that cluster. However, due to the special nature of the Google Compute Platform (GCP) Filestore resources, the automated cleanup process might not remove all of them in some rare cases. 
+
+Therefore, Red Hat recommends that you verify that all cluster-owned Filestore resources are deleted by the uninstall process.
 
 .Procedure
-To delete all GCP Filestore PVCs:
+To ensure that all GCP Filestore PVCs have been deleted:
 
-. List all PVCs that were created using the storage class `filestore-csi`:
-+
-[source, command]
-----
-$ oc get pvc -o json -A | jq -r '.items[] | select(.spec.storageClassName == "filestore-csi")
-----
+. Access your Google Cloud account using the GUI or CLI.
 
-. Delete all of the PVCs listed by the previous command:
+. Search for any resources with the `kubernetes-io-cluster-${CLUSTER_ID}=owned` label. 
 +
-[source, command]
-----
-$ oc delete <pvc-name> <1>
-----
-<1> Replace <pvc-name> with the name of any PVC that you need to delete.
+Since the cluster ID is unique to the deleted cluster, there should not be any remaining resources with that cluster ID.
+
+. In the unlikely case there are some remaining resources, delete them.