Refactor: reorder parameters to MergeConditions

This commit is contained in:
Joshua Casey
2024-08-08 08:12:41 -05:00
parent 6207121c03
commit f798777a3b
10 changed files with 53 additions and 20 deletions
@@ -569,10 +569,10 @@ func (c *gitHubWatcherController) updateStatus(
hadErrorCondition := conditionsutil.MergeConditions(
conditions,
upstream.Generation,
&updated.Status.Conditions,
log,
upstream.Generation,
metav1.NewTime(c.clock.Now()),
log,
)
updated.Status.Phase = idpv1alpha1.GitHubPhaseReady