Merge pull request #1470 from ta924/main

Avoid running traffic increase hooks when waiting for promotion or promoting
fluxcd · Aug 14, 2023 · 2944581 · 2944581
2 parents 45038cb + ca6867a
commit 2944581
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/controller/scheduler.go b/pkg/controller/scheduler.go
@@ -456,7 +456,10 @@ func (c *Controller) advanceCanary(name string, namespace string) {
 	// strategy: Canary progressive traffic increase
 	if c.nextStepWeight(cd, canaryWeight) > 0 {
 		// run hook only if traffic is not mirrored
-		if !mirrored {
+		if !mirrored &&
+			(cd.Status.Phase != flaggerv1.CanaryPhasePromoting &&
+				cd.Status.Phase != flaggerv1.CanaryPhaseWaitingPromotion &&
+				cd.Status.Phase != flaggerv1.CanaryPhaseFinalising) {
 			if promote := c.runConfirmTrafficIncreaseHooks(cd); !promote {
 				return
 			}