Merge pull request #380 from weaveworks/skip-primary-check

Skip primary check on skip analysis
fluxcd · Nov 26, 2019 · 446a2b9 · 446a2b9
2 parents 3fbe62a + 9af6ade
commit 446a2b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/canary/deployment.go b/pkg/canary/deployment.go
@@ -40,7 +40,7 @@ func (c *DeploymentController) Initialize(cd *flaggerv1.Canary, skipLivenessChec
 	}
 
 	if cd.Status.Phase == "" || cd.Status.Phase == flaggerv1.CanaryPhaseInitializing {
-		if !skipLivenessChecks {
+		if !skipLivenessChecks && !cd.Spec.SkipAnalysis {
 			_, readyErr := c.IsPrimaryReady(cd)
 			if readyErr != nil {
 				return "", ports, readyErr

diff --git a/pkg/controller/scheduler.go b/pkg/controller/scheduler.go
@@ -152,7 +152,7 @@ func (c *Controller) advanceCanary(name string, namespace string, skipLivenessCh
 	}
 
 	// check primary deployment status
-	if !skipLivenessChecks {
+	if !skipLivenessChecks && !cd.Spec.SkipAnalysis {
 		if _, err := canaryController.IsPrimaryReady(cd); err != nil {
 			c.recordEventWarningf(cd, "%v", err)
 			return