github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45534 from YuPengZTE/devPodStatus

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45534, 37212, 46613, 46350)

check err

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>



**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-30 04:45:59 -07:00 committed by GitHub
commit cd2e304360
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View File

@ -472,6 +472,9 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
return statusError, err
}
podStatus, err := podanalyzer.AnalysePods(fd.Spec.Selector, allPods, time.Now())
if err != nil {
return statusError, err
}
current := make(map[string]int64)
estimatedCapacity := make(map[string]int64)
for _, cluster := range clusters {