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

Merge pull request #15267 from nikhiljindal/deploymentRCSelector

Browse Source 
Deployment: Fixing the selector for new RC created by deployment
This commit is contained in:
Dawn Chen
2015-10-12 14:40:30 -07:00
parent 782102d437 0829bcc8fc
commit 00eb2e7bfc
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,9 @@ func (d *DeploymentController) getNewRC(deployment extensions.Deployment) (*api.
podTemplateSpecHash := deploymentUtil.GetPodTemplateSpecHash(deployment.Spec.Template)
rcName := fmt.Sprintf("deploymentrc-%d", podTemplateSpecHash)
newRCTemplate := deploymentUtil.GetNewRCTemplate(deployment)
// Add podTemplateHash label to selector.
newRCSelector := deploymentUtil.CloneAndAddLabel(deployment.Spec.Selector, deployment.Spec.UniqueLabelKey, podTemplateSpecHash)
newRC := api.ReplicationController{
ObjectMeta: api.ObjectMeta{
Name: rcName,
@@ -147,7 +150,7 @@ func (d *DeploymentController) getNewRC(deployment extensions.Deployment) (*api.
},
Spec: api.ReplicationControllerSpec{
Replicas: 0,
Selector: newRCTemplate.ObjectMeta.Labels,
Selector: newRCSelector,
Template: newRCTemplate,
},
}