From cddc53ad14e486c59dbbf1ab314146bf765a9fa9 Mon Sep 17 00:00:00 2001 From: yunbo Date: Wed, 5 Jun 2024 09:53:24 +0800 Subject: [PATCH] improve existing e2e logic to avoid unexpected behaviour Signed-off-by: yunbo --- pkg/controller/rollout/rollout_canary.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/controller/rollout/rollout_canary.go b/pkg/controller/rollout/rollout_canary.go index 961d119..0c3e62f 100644 --- 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)