From ef346ed87e441fa1f99546c4db5cb36666773842 Mon Sep 17 00:00:00 2001 From: barbacbd Date: Thu, 30 Oct 2025 12:03:44 -0400 Subject: [PATCH] OCPBUGS-63711: Remove pending items on gcp no-op The GCP Destroy process should remove pending items when a no-op error has occurred. Currently the process is to warn the user, but the items should be removed from the list of pending items to be deleted otherwise it will hold up the deprovision process indefinitely. --- pkg/destroy/gcp/gcp.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/destroy/gcp/gcp.go b/pkg/destroy/gcp/gcp.go index 21fa447837..734591f66e 100644 --- a/pkg/destroy/gcp/gcp.go +++ b/pkg/destroy/gcp/gcp.go @@ -448,11 +448,12 @@ func (o *ClusterUninstaller) handleOperation(ctx context.Context, op *compute.Op } if err != nil { + o.resetRequestID(identifier...) if isNoOp(err) { o.Logger.Debugf("No operation found for %s %s", resourceType, item.name) + o.deletePendingItems(item.typeName, []cloudResource{item}) return nil } - o.resetRequestID(identifier...) return fmt.Errorf("failed to delete %s %s: %w", resourceType, item.name, err) }