Skip to content

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 11, 2025
Merged

Fix controller shutdown status patching with a fresh context for patches #191

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46614e6
add a graceful context
rushmash91 Jun 2, 2025
2872a05
use fresh context in patch operation
rushmash91 Jun 5, 2025
3fdc952
use withoutcancel instead of trafering values
rushmash91 Jun 10, 2025
8efa3b1
update unit tests
rushmash91 Jun 10, 2025
21f3a8b
use util functions
rushmash91 Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions pkg/runtime/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ const (
// resource if the CARM cache is not synced yet, or if the roleARN is not
// available.
roleARNNotAvailableRequeueDelay = 15 * time.Second
// adoptOrCreate is an annotation field that decides whether to create the
// resource if it doesn't exist, or adopt the resource if it exists.
// value comes from getAdoptionPolicy
// adoptOrCreate = "adopt-or-create"
)

// reconciler describes a generic reconciler within ACK.
Expand Down Expand Up @@ -880,7 +876,14 @@ func (r *resourceReconciler) patchResourceMetadataAndSpec(
rlog.Enter("kc.Patch (metadata + spec)")
lorig := latestCleaned.DeepCopy()
patch := client.MergeFrom(desiredCleaned.RuntimeObject())
err = r.kc.Patch(ctx, latestCleaned.RuntimeObject(), patch)

// NOTE (rushmash91): Always use WithoutCancel to prevent patch operations from being
// cancelled while preserving context values. The 30s SIGTERM grace period acts as
// the effective timeout - no additional timeout needed to avoid interfering with
// normal Kubernetes client timeout/retry strategy.
patchCtx := context.WithoutCancel(ctx)
err = r.kc.Patch(patchCtx, latestCleaned.RuntimeObject(), patch)

if err == nil {
if rlog.IsDebugEnabled() {
js := getPatchDocument(patch, lorig.RuntimeObject())
Expand Down Expand Up @@ -916,7 +919,14 @@ func (r *resourceReconciler) patchResourceStatus(
dobj := desired.DeepCopy().RuntimeObject()
lobj := latest.DeepCopy().RuntimeObject()
patch := client.MergeFrom(dobj)
err = r.kc.Status().Patch(ctx, lobj, patch)

// NOTE (rushmash91): Always use WithoutCancel to prevent patch operations from being
// cancelled while preserving context values. The 30s SIGTERM grace period acts as
// the effective timeout - no additional timeout needed to avoid interfering with
// normal Kubernetes client timeout/retry strategy.
patchCtx := context.WithoutCancel(ctx)
err = r.kc.Status().Patch(patchCtx, lobj, patch)

if err == nil {
if rlog.IsDebugEnabled() {
js := getPatchDocument(patch, lobj)
Expand Down