Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy: default maxSurge/maxUnavailable separately #11678

Merged
merged 1 commit into from Nov 2, 2016
Merged

deploy: default maxSurge/maxUnavailable separately #11678

merged 1 commit into from Nov 2, 2016

Conversation

0xmichalis
Copy link
Contributor

@0xmichalis 0xmichalis commented Oct 31, 2016

Restores defaulting for maxSurge/maxUnavailable (regressed in #11090)

@mfojtik ptal

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1389170

@0xmichalis
Copy link
Contributor Author

[test]

@0xmichalis
Copy link
Contributor Author

#11649 and #10988 [test]

@@ -351,7 +351,7 @@ func updateConditions(config deployapi.DeploymentConfig, newStatus *deployapi.De
if latestRC != nil {
switch deployutil.DeploymentStatusFor(latestRC) {
case deployapi.DeploymentStatusPending:
msg := fmt.Sprintf("Waiting on deployer pod for replication controller %q to be scheduled", latestRC.Name)
msg := fmt.Sprintf("Waiting deployer pod for replication controller %q to run", latestRC.Name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deployer pod waiting for replication controller :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not waiting for the rc and that wording doesn't make it clear.

@mfojtik mfojtik added this to the 1.4.0 milestone Nov 2, 2016
@0xmichalis
Copy link
Contributor Author

@mfojtik updated, ptal

@mfojtik
Copy link
Member

mfojtik commented Nov 2, 2016

LGTM [merge]

This is fixing BZ 1389170.

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 2, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11021/) (Image: devenv-rhel7_5305)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 56f4626

@0xmichalis
Copy link
Contributor Author

#10228 [test]

@0xmichalis
Copy link
Contributor Author

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 56f4626

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11021/) (Base Commit: cf6ed4b)

@openshift-bot openshift-bot merged commit e683cbf into openshift:master Nov 2, 2016
@0xmichalis 0xmichalis deleted the fix-defaulting-params branch November 2, 2016 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants