mirror of
https://github.com/vmware-tanzu/pinniped.git
synced 2026-09-05 23:57:12 +00:00
Refactor: reorder parameters to MergeConditions
This commit is contained in:
+2
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user