🐛Fix behavior of rate limit option in priorityqueue.AddWithOpts

[zach593]

controller-runtime/pkg/controller/priorityqueue/priorityqueue.go

Lines 130 to 146 in 2e8ba92

	func (w *priorityqueue[T]) AddWithOpts(o AddOpts, items ...T) {
	w.lock.Lock()
	defer w.lock.Unlock()
	for _, key := range items {
	if o.RateLimited {
	after := w.rateLimiter.When(key)
	if o.After == 0 || after < o.After {
	o.After = after
	}
	}
	var readyAt *time.Time
	if o.After > 0 {
	readyAt = ptr.To(w.now().Add(o.After))
	w.metrics.retry()
	}

Since priorityqueue.AddWithOpts() allows adding multiple items, if o.RateLimited is true, the o.After value could get overwritten in the loop and affect subsequent items.

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: zach593 / name: Zach (ba53477)

[k8s-ci-robot]

Hi @zach593. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[alvaroaleman]

/ok-to-test

[alvaroaleman]

/cherrypick release-0.20

[k8s-infra-cherrypick-robot]

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release-0.20 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-0.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[alvaroaleman]

great catch, thanks for that and sending the fix!

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, zach593

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [alvaroaleman]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[k8s-ci-robot]

LGTM label has been added.

Details

Git tree hash: c797a95efef6c9d54f182307413849d0217fb33d

[k8s-infra-cherrypick-robot]

@alvaroaleman: new pull request created: #3106

Details

In response to this:

/cherrypick release-0.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.