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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick of "controller: old pods should block deployment completeness" to 1.5 #40625

Merged
merged 1 commit into from Jan 31, 2017
Merged

Cherry-pick of "controller: old pods should block deployment completeness" to 1.5 #40625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/controller/deployment/util/deployment_util.go
View file
Open in desktop
Expand Up @@ -800,9 +800,10 @@ func IsRollingUpdate(deployment *extensions.Deployment) bool {
}

// DeploymentComplete considers a deployment to be complete once its desired replicas equals its
// updatedReplicas and it doesn't violate minimum availability.
// updatedReplicas, no old pods are running, and it doesn't violate minimum availability.
func DeploymentComplete(deployment *extensions.Deployment, newStatus *extensions.DeploymentStatus) bool {
return newStatus.UpdatedReplicas == deployment.Spec.Replicas &&
newStatus.Replicas == deployment.Spec.Replicas &&
newStatus.AvailableReplicas >= deployment.Spec.Replicas-MaxUnavailable(*deployment)
}

Expand Down
19 changes: 14 additions & 5 deletions pkg/controller/deployment/util/deployment_util_test.go
View file
Open in desktop
Expand Up @@ -894,13 +894,14 @@ func TestRemoveCondition(t *testing.T) {
}

func TestDeploymentComplete(t *testing.T) {
deployment := func(desired, current, updated, available, maxUnavailable int32) *extensions.Deployment {
deployment := func(desired, current, updated, available, maxUnavailable, maxSurge int32) *extensions.Deployment {
return &extensions.Deployment{
Spec: extensions.DeploymentSpec{
Replicas: desired,
Strategy: extensions.DeploymentStrategy{
RollingUpdate: &extensions.RollingUpdateDeployment{
MaxUnavailable: intstr.FromInt(int(maxUnavailable)),
MaxSurge: intstr.FromInt(int(maxSurge)),
},
Type: extensions.RollingUpdateDeploymentStrategyType,
},
Expand All @@ -923,25 +924,33 @@ func TestDeploymentComplete(t *testing.T) {
{
name: "complete",

d: deployment(5, 5, 5, 4, 1),
d: deployment(5, 5, 5, 4, 1, 0),
expected: true,
},
{
name: "not complete",

d: deployment(5, 5, 5, 3, 1),
d: deployment(5, 5, 5, 3, 1, 0),
expected: false,
},
{
name: "complete #2",

d: deployment(5, 5, 5, 5, 0),
d: deployment(5, 5, 5, 5, 0, 0),
expected: true,
},
{
name: "not complete #2",

d: deployment(5, 5, 4, 5, 0),
d: deployment(5, 5, 4, 5, 0, 0),
expected: false,
},
{
name: "not complete #3",

// old replica set: spec.replicas=1, status.replicas=1, status.availableReplicas=1
// new replica set: spec.replicas=1, status.replicas=1, status.availableReplicas=0
d: deployment(1, 2, 1, 1, 0, 1),
expected: false,
},
}
Expand Down