Skip to content

Commit

Permalink
Merge pull request #526 from weaveworks/fix-typo-daemon
Browse files Browse the repository at this point in the history
fix typos in error messages
  • Loading branch information
mathetake authored Mar 26, 2020
2 parents 658dec2 + 6a16dc0 commit 70475d4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/canary/deployment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (c *DeploymentController) Initialize(cd *flaggerv1.Canary, skipLivenessChec
c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).
Infof("Scaling down Deployment %s.%s", cd.Spec.TargetRef.Name, cd.Namespace)
if err := c.ScaleToZero(cd); err != nil {
return fmt.Errorf("scaling down canary daemon set %s.%s failed: %w", cd.Spec.TargetRef.Name, cd.Namespace, err)
return fmt.Errorf("scaling down canary deployment %s.%s failed: %w", cd.Spec.TargetRef.Name, cd.Namespace, err)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/canary/deployment_ready.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (c *DeploymentController) IsPrimaryReady(cd *flaggerv1.Canary) error {

_, err = c.isDeploymentReady(primary, cd.GetProgressDeadlineSeconds())
if err != nil {
return fmt.Errorf("primary daemonset %s.%s not ready: %w", primaryName, cd.Namespace, err)
return fmt.Errorf("primary deployment %s.%s not ready: %w", primaryName, cd.Namespace, err)
}

if primary.Spec.Replicas == int32p(0) {
Expand Down

0 comments on commit 70475d4

Please sign in to comment.