Skip to content

[release-2.1] fix(operator): Use Patch to update TrainJob status #3012

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
google-oss-prow merged 1 commit into from
Nov 27, 2025
Merged

[release-2.1] fix(operator): Use Patch to update TrainJob status #3012

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
8 changes: 5 additions & 3 deletions pkg/controller/trainjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (r *TrainJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c

var err error
// Keep track of the origin TrainJob status
originStatus := trainJob.Status.DeepCopy()
prevTrainJob := trainJob.DeepCopy()

// Let's clear the failed condition that could have been set previously.
// An external change to the TrainJob spec may transition it out of the Failed state.
Expand Down Expand Up @@ -136,8 +136,10 @@ func (r *TrainJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
err = errors.Join(err, statusErr)
}

if !equality.Semantic.DeepEqual(&trainJob.Status, originStatus) {
return ctrl.Result{}, errors.Join(err, r.client.Status().Update(ctx, &trainJob))
if !equality.Semantic.DeepEqual(&trainJob.Status, prevTrainJob.Status) {
// TODO(astefanutti): Consider using SSA once controller-runtime client has SSA support
// for sub-resources. See: https://github.com/kubernetes-sigs/controller-runtime/issues/3183
return ctrl.Result{}, errors.Join(err, r.client.Status().Patch(ctx, &trainJob, client.MergeFrom(prevTrainJob)))
}
return ctrl.Result{}, err
}
Expand Down
Loading