🐛 clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit

[chrischdi]

What this PR does / why we need it:

Sets RequeueAfter: time.Minute instead of Requeue: true on ErrClusterLocked.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #9775

Area example:
/area clusterresourceset

[chrischdi]

cc @sbueringer

[chrischdi]

cc @fabriziopandini

[sbueringer]

I'm fine with keeping this PR focused. But I would make similar changes in all other cases where we handle the same error from CCT

/lgtm
/approve

/hold

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 8537941c4bf1114d87d31591295ce0ec9979a518

[chrischdi]

/retest

[killianmuldoon]

/retest

[killianmuldoon]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.5

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/test-infra repository.

[killianmuldoon]

/cherry-pick release-1.6

[killianmuldoon]

/cherry-pick release-1.4

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.4

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/test-infra repository.

[killianmuldoon]

/lgtm
/approve

/hold cancel

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon, sbueringer

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [killianmuldoon,sbueringer]

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

[k8s-infra-cherrypick-robot]

@killianmuldoon: #9777 failed to apply on top of branch "release-1.4":

Applying: clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit
Using index info to reconstruct a base tree...
M	exp/addons/internal/controllers/clusterresourceset_controller.go
Falling back to patching base and 3-way merge...
Auto-merging exp/addons/internal/controllers/clusterresourceset_controller.go
CONFLICT (content): Merge conflict in exp/addons/internal/controllers/clusterresourceset_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.4

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/test-infra repository.

[k8s-infra-cherrypick-robot]

@killianmuldoon: new pull request created: #9787

In response to this:

/cherry-pick release-1.5

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/test-infra repository.

[killianmuldoon]

/cherry-pick release-1.6

[k8s-infra-cherrypick-robot]

@killianmuldoon: new pull request created: #9788

In response to this:

/cherry-pick release-1.6

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/test-infra repository.

[sbueringer]

@chrischdi can you please check if it makes sense to cherry-pick into 1.4?