github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19520 from janetkuo/deployment-expectation-fix

Browse Source 
Fix e2e flake: Fix incorrect expectation when deployment scaling down old rcs
This commit is contained in:
Alex Mohr
2016-01-20 13:44:30 -08:00
parent a5d2c1b0fb d693ffaa57
commit a9050679a5
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/deployment/deployment_controller.go
View File

@@ -633,6 +633,7 @@ func (dc *DeploymentController) reconcileOldRCs(allRCs []*api.ReplicationControl
return false, nil return false, nil
} }
totalScaleDownCount := readyPodCount - minAvailable totalScaleDownCount := readyPodCount - minAvailable
totalScaledDown := 0
for _, targetRC := range oldRCs { for _, targetRC := range oldRCs {
if totalScaleDownCount == 0 { if totalScaleDownCount == 0 {
// No further scaling required. // No further scaling required.
@@ -649,14 +650,16 @@ func (dc *DeploymentController) reconcileOldRCs(allRCs []*api.ReplicationControl
if err != nil { if err != nil {
return false, err return false, err
} }
totalScaledDown += scaleDownCount
totalScaleDownCount -= scaleDownCount totalScaleDownCount -= scaleDownCount
dKey, err := controller.KeyFunc(&deployment) }
// Expect to see old rcs scaled down by exactly totalScaledDownCount (sum of scaleDownCount) replicas.
dKey, err = controller.KeyFunc(&deployment)
if err != nil { if err != nil {
return false, fmt.Errorf("Couldn't get key for deployment %#v: %v", deployment, err) return false, fmt.Errorf("Couldn't get key for deployment %#v: %v", deployment, err)
} }
if expectationsCheck { if expectationsCheck {
dc.podExpectations.ExpectDeletions(dKey, scaleDownCount) dc.podExpectations.ExpectDeletions(dKey, totalScaledDown)
}
} }
return true, err return true, err
} }