Merge pull request #6972 from barbacbd/cherry-pick-5976-to-release-4.10

OCPBUGS-5931: destroy/gcp: Disk names are filtered using kubernetes name format
openshift · May 9, 2023 · 3172e19 · 3172e19
2 parents 8862860 + b1f7025
commit 3172e19
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/destroy/gcp/disk.go b/pkg/destroy/gcp/disk.go
@@ -44,7 +44,7 @@ func (o *ClusterUninstaller) storageLabelOrClusterIDFilter() string {
 }
 
 func (o *ClusterUninstaller) listDisks() ([]cloudResource, error) {
-	return o.listDisksWithFilter("items/*/disks(name,zone,type,sizeGb),nextPageToken", o.clusterLabelOrClusterIDFilter(), nil)
+	return o.listDisksWithFilter("items/*/disks(name,zone,type,sizeGb),nextPageToken", o.storageLabelOrClusterIDFilter(), nil)
 }
 
 // listDisksWithFilter lists disks in the project that satisfy the filter criteria.