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

Make listing deployment rcStore namespaced

Browse Source
This commit is contained in:
Janet Kuo
2016-01-25 19:13:17 -08:00
parent 1e68e719c3
commit 14f4f1b065
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

@@ -514,7 +514,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()
})
}
@@ -523,7 +523,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