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

fix: switch service selector back to stable on canary service when aborted #2540

Merged
merged 7 commits into from
Feb 28, 2023
Merged

fix: switch service selector back to stable on canary service when aborted #2540

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb4c244
wip
zachaller Jan 25, 2023
dc5358b
Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-s…
zachaller Feb 9, 2023
2ca5c0b
work with both dynamic stable scale on and off
zachaller Feb 9, 2023
afc08c6
add e2e tests
zachaller Feb 9, 2023
217c897
Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-s…
zachaller Feb 9, 2023
e265e0e
cleanup comments
zachaller Feb 9, 2023
820f516
cleanup if logic
zachaller Feb 27, 2023
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
7 changes: 7 additions & 0 deletions rollout/trafficrouting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,13 @@ func (c *rolloutContext) reconcileTrafficRouting() error {
return err
}

// If we are aborting, we want to set the desired weight to 0, but we also want to set the canary service
zachaller marked this conversation as resolved.
Show resolved Hide resolved
// to point to the stable service.
err = c.ensureSVCTargets(c.rollout.Spec.Strategy.Canary.CanaryService, c.stableRS, true)
if err != nil {
return err
}

} else if c.newRS == nil || c.newRS.Status.AvailableReplicas == 0 {
// when newRS is not available or replicas num is 0. never weight to canary
weightDestinations = append(weightDestinations, c.calculateWeightDestinationsFromExperiment()...)
Expand Down
2 changes: 2 additions & 0 deletions rollout/trafficrouting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@ func TestDynamicScalingDontIncreaseWeightWhenAborted(t *testing.T) {
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)
Expand Down Expand Up @@ -964,6 +965,7 @@ func TestDynamicScalingDecreaseWeightAccordingToStableAvailabilityWhenAborted(t
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)
Expand Down