Merge pull request #3219 from alingse/fix-nilness-err

kcp-ci-bot · web-flow · commit 95838e46936f · 2024-12-16T09:43:00.000+01:00
🐛 fix check `deleteError != nil` but return an other nil value `err`
diff --git a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go
@@ -118,7 +118,7 @@ func (c *Controller) deleteAllCR(ctx context.Context, clusterName logicalcluster
 
 	deleteError := utilerrors.NewAggregate(deleteErrors)
 	if deleteError != nil {
-		return gvrDeletionMetadata{}, err
+		return gvrDeletionMetadata{}, deleteError
 	}
 
 	// resource will not be delete immediately, instead of list again, we just return the

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (c *Controller) deleteAllCR(ctx context.Context, clusterName logicalcluster`
`118`	`118`
`119`	`119`	`deleteError := utilerrors.NewAggregate(deleteErrors)`
`120`	`120`	`if deleteError != nil {`
`121`		`- return gvrDeletionMetadata{}, err`
	`121`	`+ return gvrDeletionMetadata{}, deleteError`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// resource will not be delete immediately, instead of list again, we just return the`