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

Do not promote when not ready on skip analysis #695

Merged
merged 9 commits into from
Sep 29, 2020
Merged

Do not promote when not ready on skip analysis #695

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2907526
Do not promote when not ready on skip analysis
worldtiki Sep 14, 2020
013949a
Add tests for when canary analysis is skipped
worldtiki Sep 18, 2020
8119acb
Remove comment :)
worldtiki Sep 18, 2020
4b098cc
Better assertion for new tests
worldtiki Sep 18, 2020
0eee5b7
Revert changes in skip analysis condition
worldtiki Sep 18, 2020
26d53dc
diff test stucture for istio
worldtiki Sep 18, 2020
3b63026
Remove custom metrics (not needed for tests)
worldtiki Sep 18, 2020
1a90392
Add set -o errexit
worldtiki Sep 19, 2020
065c864
Remove metadata tests (unrelated to skip analysis)
worldtiki Sep 19, 2020
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
13 changes: 11 additions & 2 deletions pkg/controller/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (c *Controller) advanceCanary(name string, namespace string) {
}

// check if analysis should be skipped
if skip := c.shouldSkipAnalysis(cd, canaryController, meshRouter); skip {
if skip := c.shouldSkipAnalysis(cd, canaryController, meshRouter, err, retriable); skip {
return
}

Expand Down Expand Up @@ -616,11 +616,20 @@ func (c *Controller) runAnalysis(canary *flaggerv1.Canary) bool {
return true
}

func (c *Controller) shouldSkipAnalysis(canary *flaggerv1.Canary, canaryController canary.Controller, meshRouter router.Interface) bool {
func (c *Controller) shouldSkipAnalysis(canary *flaggerv1.Canary, canaryController canary.Controller, meshRouter router.Interface, err error, retriable bool) bool {
if !canary.SkipAnalysis() {
return false
}

// regardless if analysis is being skipped, rollback if canary failed to progress
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

without this block, flagger immediately tries to promote the new version which at this point has 0 healthy pods.

if !retriable || canary.Status.FailedChecks >= canary.GetAnalysisThreshold() {
c.recordEventWarningf(canary, "Rolling back %s.%s progress deadline exceeded %v", canary.Name, canary.Namespace, err)
c.alert(canary, fmt.Sprintf("Progress deadline exceeded %v", err), false, flaggerv1.SeverityError)
c.rollback(canary, canaryController, meshRouter)

return true
}

// route all traffic to primary
primaryWeight := 100
canaryWeight := 0
Expand Down