github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-08-29 02:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/canary: refator error handlings and enhance messages

Browse Source
This commit is contained in:
mathetake
2020-03-07 23:10:07 +09:00
parent e59acc7bae
commit 8e9b9a358f
17 changed files with 264 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/scheduler.go
+4 -4
View File
@@ -163,7 +163,7 @@ func (c *Controller) advanceCanary(name string, namespace string, skipLivenessCh
// check primary status
if !skipLivenessChecks && !cd.SkipAnalysis() {
if _, err := canaryController.IsPrimaryReady(cd); err != nil {
if err := canaryController.IsPrimaryReady(cd); err != nil {
c.recordEventWarningf(cd, "%v", err)
return
}
@@ -258,7 +258,7 @@ func (c *Controller) advanceCanary(name string, namespace string, skipLivenessCh
// scale canary to zero if promotion has finished
if cd.Status.Phase == flaggerv1.CanaryPhaseFinalising {
if err := canaryController.Scale(cd, 0); err != nil {
if err := canaryController.ScaleToZero(cd); err != nil {
c.recordEventWarningf(cd, "%v", err)
return
}
@@ -554,7 +554,7 @@ func (c *Controller) shouldSkipAnalysis(canary *flaggerv1.Canary, canaryControll
}
// shutdown canary
if err := canaryController.Scale(canary, 0); err != nil {
if err := canaryController.ScaleToZero(canary); err != nil {
c.recordEventWarningf(canary, "%v", err)
return false
}
@@ -1030,7 +1030,7 @@ func (c *Controller) rollback(canary *flaggerv1.Canary, canaryController canary.
c.recorder.SetWeight(canary, primaryWeight, canaryWeight)
// shutdown canary
if err := canaryController.Scale(canary, 0); err != nil {
if err := canaryController.ScaleToZero(canary); err != nil {
c.recordEventWarningf(canary, "%v", err)
return
}