fix conflict

Signed-off-by: Zach Aller <[email protected]>
argoproj · Dec 10, 2024 · 2d5a653 · 2d5a653
1 parent 79bda52
commit 2d5a653
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/rollout/trafficrouting_test.go b/rollout/trafficrouting_test.go
@@ -1095,7 +1095,6 @@ func TestDynamicScalingDecreaseWeightAccordingToStableAvailabilityWhenAbortedAnd
 	f.objects = append(f.objects, r2)
 
 	f.expectPatchRolloutAction(r2)
-	f.expectPatchServiceAction(canarySvc, rs1PodHash)
 
 	f.fakeTrafficRouting = newUnmockedFakeTrafficRoutingReconciler()
 	f.fakeTrafficRouting.On("UpdateHash", mock.Anything, mock.Anything, mock.Anything).Return(nil)