Merge pull request #10049 from barbacbd/OCPBUGS-63711

openshift-merge-bot[bot] · web-flow · commit d95c62866c2f · 2025-11-01T02:27:04.000Z
OCPBUGS-63711: Remove pending items on gcp no-op
diff --git 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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -448,11 +448,12 @@ func (o ClusterUninstaller) handleOperation(ctx context.Context, op compute.Op`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`if err != nil {`
	`451`	`+ o.resetRequestID(identifier...)`
`451`	`452`	`if isNoOp(err) {`
`452`	`453`	`o.Logger.Debugf("No operation found for %s %s", resourceType, item.name)`
	`454`	`+ o.deletePendingItems(item.typeName, []cloudResource{item})`
`453`	`455`	`return nil`
`454`	`456`	`}`
`455`		`- o.resetRequestID(identifier...)`
`456`	`457`	`return fmt.Errorf("failed to delete %s %s: %w", resourceType, item.name, err)`
`457`	`458`	`}`
`458`	`459`