Merge remote-tracking branch 'origin/master' into release-1.34

This commit is contained in:
Kubernetes Release Robot
2025-08-14 10:24:52 +00:00

View File

@@ -1469,12 +1469,13 @@ func (pl *DynamicResources) bindClaim(ctx context.Context, state *stateData, ind
if pollErr != nil {
logger.V(5).Info("Claim not stored in assume cache after retries", "claim", klog.KObj(claim), "err", pollErr)
}
}
} else {
if err := pl.draManager.ResourceClaims().AssumeClaimAfterAPICall(claim); err != nil {
logger.V(5).Info("Claim not stored in assume cache", "err", err)
} else {
if err := pl.draManager.ResourceClaims().AssumeClaimAfterAPICall(claim); err != nil {
logger.V(5).Info("Claim not stored in assume cache", "err", err)
}
}
}
for _, claimUID := range claimUIDs {
pl.draManager.ResourceClaims().RemoveClaimPendingAllocation(claimUID)
}