fix: canary step analysis run wasn't terminated as keep running after…

… promote action being called
argoproj · Dec 6, 2023 · 758b6de · 758b6de
1 parent d378ce7
commit 758b6de
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rollout/analysis.go b/rollout/analysis.go
@@ -372,7 +372,10 @@ func (c *rolloutContext) reconcileStepBasedAnalysisRun() (*v1alpha1.AnalysisRun,
 		return currentAr, nil
 	}
 
-	if step == nil || step.Analysis == nil || index == nil {
+	// for promotion cases
+	analysisRunFromPreviousStep := step != nil && step.Analysis != nil && currentAr != nil && currentAr.GetLabels()[v1alpha1.RolloutCanaryStepIndexLabel] != strconv.Itoa(int(*index))
+
+	if step == nil || step.Analysis == nil || index == nil || analysisRunFromPreviousStep {
 		err := c.cancelAnalysisRuns([]*v1alpha1.AnalysisRun{currentAr})
 		return nil, err
 	}