Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[release-1.28] chore: respect RetryAfter in throttling condition #1709

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

andyzhangx
Copy link
Member

This is an automated cherry-pick of #1706

/assign andyzhangx

none

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 18, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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:

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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 18, 2024
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 62b5785 into release-1.28 Feb 19, 2024
28 of 29 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.27

@andyzhangx
Copy link
Member Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

@andyzhangx: #1709 failed to apply on top of branch "release-1.27":

Applying: chore: respect RetryAfter in throttling condition
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
M	pkg/azurefile/controllerserver.go
M	pkg/azurefile/utils.go
M	pkg/azurefile/utils_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/utils_test.go
Auto-merging pkg/azurefile/utils.go
CONFLICT (content): Merge conflict in pkg/azurefile/utils.go
Auto-merging pkg/azurefile/controllerserver.go
Auto-merging pkg/azurefile/azurefile.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 chore: respect RetryAfter in throttling condition
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:

/cherrypick release-1.27

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

@andyzhangx: #1709 failed to apply on top of branch "release-1.26":

Applying: chore: respect RetryAfter in throttling condition
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
M	pkg/azurefile/controllerserver.go
M	pkg/azurefile/utils.go
M	pkg/azurefile/utils_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/utils_test.go
Auto-merging pkg/azurefile/utils.go
CONFLICT (content): Merge conflict in pkg/azurefile/utils.go
Auto-merging pkg/azurefile/controllerserver.go
Auto-merging pkg/azurefile/azurefile.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 chore: respect RetryAfter in throttling condition
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:

/cherrypick release-1.26

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.

@andyzhangx andyzhangx deleted the respect-RetryAfter-1.28 branch February 19, 2024 12:40
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants