Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

add transient error handling to AMMP delete #4039

Merged
merged 1 commit into from
Sep 28, 2023

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Sep 26, 2023

What type of PR is this?
/kind bug
/area managedclusters

What this PR does / why we need it: This PR adds logic to handle transient errors in the AzureManagedMachinePool controller like in other controllers. Without this, transient errors (including "operation not done") cause a resource to get requeued as if any other error occurred, which is likely more frequent than necessary.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Possibly related to the flake described in #3970

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Fixed a bug causing transient errors in AzureManagedMachinePool reconciliation to requeue too aggressively

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 26, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 26, 2023
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Sep 26, 2023

/cherry-pick release-1.10
/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.10
/cherry-pick release-1.11

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.

@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (79b63b5) 56.57% compared to head (74a59ba) 56.60%.
Report is 6 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4039      +/-   ##
==========================================
+ Coverage   56.57%   56.60%   +0.02%     
==========================================
  Files         187      187              
  Lines       19130    19138       +8     
==========================================
+ Hits        10823    10833      +10     
+ Misses       7676     7674       -2     
  Partials      631      631              
Files Coverage Δ
controllers/azuremanagedmachinepool_controller.go 56.14% <66.66%> (+1.14%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Sep 26, 2023

Role assignments issue should be ok now
/retest

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 26, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: de42eaee4dc0bd8f2b7767ff958913f3fabf0f6b

Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Sep 27, 2023
@k8s-ci-robot k8s-ci-robot merged commit c561209 into kubernetes-sigs:main Sep 28, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Sep 28, 2023
@k8s-infra-cherrypick-robot

@nojnhuh: #4039 failed to apply on top of branch "release-1.10":

Applying: add transient error handling to AMMP delete
Using index info to reconstruct a base tree...
M	controllers/azuremanagedmachinepool_controller.go
M	controllers/azuremanagedmachinepool_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/azuremanagedmachinepool_controller_test.go
CONFLICT (content): Merge conflict in controllers/azuremanagedmachinepool_controller_test.go
Auto-merging controllers/azuremanagedmachinepool_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 add transient error handling to AMMP delete
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.10
/cherry-pick release-1.11

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

@nojnhuh: new pull request created: #4047

In response to this:

/cherry-pick release-1.10
/cherry-pick release-1.11

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/managedclusters Issues related to managed AKS clusters created through the CAPZ ManagedCluster Type cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants