Skip to content

[V2] Fix CRD update conflict error #7181

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
popojk merged 1 commit into from
Apr 13, 2026
+11 −1
Merged

[V2] Fix CRD update conflict error #7181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion executor/pkg/controller/taskaction_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
"k8s.io/client-go/util/retry"
"reflect"
"strings"
"time"
Expand Down Expand Up @@ -402,7 +403,16 @@ func (r *TaskActionReconciler) updateTaskActionStatus(
return err
}

if err := r.Status().Update(ctx, newTaskAction); err != nil {
// The retry.RetryOnConflict will refetch the k8s resource to get the latest resource version
// This will resovle the conflict error caused by k8s optimistic lock when 2 reconcile loops updating the same CRD
if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
latest := &flyteorgv1.TaskAction{}
if getErr := r.Get(ctx, client.ObjectKeyFromObject(newTaskAction), latest); getErr != nil {
return getErr
}
latest.Status = newTaskAction.Status
return r.Status().Update(ctx, latest)
}); err != nil {
logger.Error(err, "Error updating status", "name", oldTaskAction.Name, "error", err, "TaskAction", newTaskAction)
return err
}
Expand Down
Loading