improve existing e2e logic to avoid unexpected behaviour

Signed-off-by: yunbo <yunbo10124scut@gmail.com>
2024-06-05 09:53:24 +08:00 · 2024-06-05 09:53:24 +08:00 · cddc53ad14
parent 12ce7c8635
commit cddc53ad14
1 changed files with 4 additions and 0 deletions
--- a/pkg/controller/rollout/rollout_canary.go
+++ b/pkg/controller/rollout/rollout_canary.go
@ -209,6 +209,10 @@ func (m *canaryReleaseManager) doCanaryMetricsAnalysis(c *RolloutContext) (bool,
 }

 func (m *canaryReleaseManager) doCanaryPaused(c *RolloutContext) (bool, error) {
+	if m.doCanaryJump(c) {
+		klog.Infof("rollout(%s/%s) canary step jumped", c.Rollout.Namespace, c.Rollout.Name)
+		return false, nil
+	}
 	canaryStatus := c.NewStatus.CanaryStatus
 	currentStep := c.Rollout.Spec.Strategy.Canary.Steps[canaryStatus.CurrentStepIndex-1]
 	steps := len(c.Rollout.Spec.Strategy.Canary.Steps)