-
Notifications
You must be signed in to change notification settings - Fork 180
Fix controller shutdown status patching with a fresh context for patches #191
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add a test for this behavior?
|
/retest |
|
/test ec2-controller-test |
|
@rushmash91: The
The following commands are available to trigger optional jobs:
Use In response to this:
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. |
|
/test s3-controller-test |
|
/test ec2-controller-test |
|
/hold |
3dbcccc to
19c06a9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice, thanks @rushmash91 !
|
/unhold |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great job @rushmash91 !
/lgtm
|
/retest |
|
@rushmash91: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: a-hilaly, knottnt, rushmash91 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 |
|
/test ec2-controller-test |
Fixes: aws-controllers-k8s/community#2497, aws-controllers-k8s/community#2103
Description of changes:
During controller shutdown (SIGTERM), status updates were failing because
patchResourceStatuswas attempting to patch using the original cancelled context. This resulted in resources not having their final status properly updated in the resource manifest, leaving them in an inconsistent state.FIX: Always use
context.WithoutCancel(ctx)for all patch operations to prevent cancellation propagation while preserving context values. The 30s SIGTERM grace period serves as the effective timeout, eliminating the need for additional timeout logic that could interfere with normal Kubernetes client timeout/retry strategy.Changes:
Created util functions:
Operations updated to Use
context.WithoutCancel(ctx)Main Reconciler:
Adoption Reconciler:
Field Export Reconciler:
eg logs:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.