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

Merge pull request #20139 from janetkuo/rcList-namespace

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-30 09:42:35 -08:00
parent ef851cd7d1 14f4f1b065
commit 783d1d00d7
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,7 +533,7 @@ func (dc *DeploymentController) getOldRCs(deployment extensions.Deployment) ([]*
return &podList, err
},
func(namespace string, options api.ListOptions) ([]api.ReplicationController, error) {
return dc.rcStore.List()
return dc.rcStore.ReplicationControllers(namespace).List()
})
}
@@ -542,7 +542,7 @@ func (dc *DeploymentController) getOldRCs(deployment extensions.Deployment) ([]*
func (dc *DeploymentController) getNewRC(deployment extensions.Deployment) (*api.ReplicationController, error) {
existingNewRC, err := deploymentutil.GetNewRCFromList(deployment, dc.client,
func(namespace string, options api.ListOptions) ([]api.ReplicationController, error) {
return dc.rcStore.List()
return dc.rcStore.ReplicationControllers(namespace).List()
})
if err != nil || existingNewRC != nil {
return existingNewRC, err