Skip to content
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

Jump to bottom

fix loss of Status subresource information #421

Merged
merged 2 commits into from
Aug 29, 2022
Merged

fix loss of Status subresource information #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95001dd
fix loss of Status subresource information
hendrikKahl Aug 26, 2022
61126f8
Merge branch 'master' into fix/reconcile-status
hendrikKahl Aug 29, 2022
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: 10 additions & 2 deletions pkg/testmachinery/controller/reconciler/testrun_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ func (r *TestmachineryReconciler) createWorkflow(ctx context.Context, rCtx *reco
rCtx.tr.Status.Workflow = rCtx.wf.Name
rCtx.tr.Status.Phase = tmv1beta1.RunPhaseRunning

// update status first because otherwise it would be lost during the patch call
rCtx.tr.Status.ObservedGeneration = rCtx.tr.Generation
if err := r.Status().Update(ctx, rCtx.tr); err != nil {
log.Error(err, "unable to update testrun status")
return reconcile.Result{}, err
}

patch := client.MergeFrom(rCtx.tr.DeepCopy())

// add finalizers for testrun
trFinalizers := sets.NewString(rCtx.tr.Finalizers...)
if !trFinalizers.Has(tmv1beta1.SchemeGroupVersion.Group) {
Expand All @@ -170,8 +179,7 @@ func (r *TestmachineryReconciler) createWorkflow(ctx context.Context, rCtx *reco
}
rCtx.tr.Finalizers = trFinalizers.UnsortedList()

// update here to add finalizers
if err := r.Update(ctx, rCtx.tr); err != nil {
if err := r.Patch(ctx, rCtx.tr, patch); err != nil {
return reconcile.Result{}, nil
}

Expand Down