Skip to content

Commit 5a9a61b

Browse files
committed
OCPBUGS-46605: Find instances by label GCP
This fixes a regression where finding instances by label was not working correctly. The labels field must be requested when querying for instance information.
1 parent 8e61d64 commit 5a9a61b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/destroy/gcp/instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ func (o *ClusterUninstaller) getInstanceNameAndZone(instanceURL string) (string,
2727
}
2828

2929
func (o *ClusterUninstaller) listInstances(ctx context.Context) ([]cloudResource, error) {
30-
byName, err := o.listInstancesWithFilter(ctx, "items/*/instances(name,zone,status,machineType),nextPageToken", o.clusterIDFilter(), nil)
30+
byName, err := o.listInstancesWithFilter(ctx, "items/*/instances(name,zone,status,machineType,labels),nextPageToken", o.clusterIDFilter(), nil)
3131
if err != nil {
3232
return nil, err
3333
}
3434

35-
byLabel, err := o.listInstancesWithFilter(ctx, "items/*/instances(name,zone,status,machineType),nextPageToken", o.clusterLabelFilter(), nil)
35+
byLabel, err := o.listInstancesWithFilter(ctx, "items/*/instances(name,zone,status,machineType,labels),nextPageToken", o.clusterLabelFilter(), nil)
3636
if err != nil {
3737
return nil, err
3838
}

0 commit comments

Comments
 (0)