use withoutcancel instead of trafering values

Author: rushmash91

pkg/runtime/reconciler.go

@@ -57,14 +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"
-	// patchContextTimeout is the default duration to patch the resource. This
-	// is used to ensure critical metadata/spec/status updates are saved even
-	// during controller shutdown
-	patchContextTimeout = 10 * time.Second
 )
 
 // reconciler describes a generic reconciler within ACK.
@@ -864,20 +856,6 @@ func (r *resourceReconciler) patchResourceMetadataAndSpec(
 	var err error
 	rlog := ackrtlog.FromContext(ctx)
 
-	// Create fresh timeout context for the patch operation
-	// This is to ensure that the patch operation is not cancelled
-	// when the original context is cancelled
-	patchCtx, cancel := context.WithTimeout(context.Background(), patchContextTimeout)
-	defer cancel()
-
-	// Transfer important values from the original context to the patch context
-	patchCtx = context.WithValue(patchCtx, ackrtlog.ContextKey, rlog)
-	if ns := ctx.Value("resourceNamespace"); ns != nil {
-		patchCtx = context.WithValue(patchCtx, "resourceNamespace", ns)
-	}
-
-	rlog.Info("created patch context with timeout", "timeout_seconds", patchContextTimeout.Seconds())
-
 	exit := rlog.Trace("r.patchResourceMetadataAndSpec")
 	defer func() {
 		exit(err)
@@ -900,7 +878,12 @@ func (r *resourceReconciler) patchResourceMetadataAndSpec(
 	lorig := latestCleaned.DeepCopy()
 	patch := client.MergeFrom(desiredCleaned.RuntimeObject())
 
-	// Use the fresh timeout context for the patch operation
+	// 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 {
@@ -930,20 +913,6 @@ func (r *resourceReconciler) patchResourceStatus(
 	var err error
 	rlog := ackrtlog.FromContext(ctx)
 
-	// Create fresh timeout context for the patch operation
-	// This is to ensure that the patch operation is not cancelled
-	// when the original context is cancelled
-	patchCtx, cancel := context.WithTimeout(context.Background(), patchContextTimeout)
-	defer cancel()
-
-	// Transfer important values from the original context to the patch context
-	patchCtx = context.WithValue(patchCtx, ackrtlog.ContextKey, rlog)
-	if ns := ctx.Value("resourceNamespace"); ns != nil {
-		patchCtx = context.WithValue(patchCtx, "resourceNamespace", ns)
-	}
-
-	rlog.Info("created patch context with timeout", "timeout_seconds", patchContextTimeout.Seconds())
-
 	exit := rlog.Trace("r.patchResourceStatus")
 	defer func() {
 		exit(err)
@@ -954,7 +923,12 @@ func (r *resourceReconciler) patchResourceStatus(
 	lobj := latest.DeepCopy().RuntimeObject()
 	patch := client.MergeFrom(dobj)
 
-	// Use the fresh timeout context for the patch operation
+	// 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 {