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

ReplicaSetSpec.Template shouldn't be a pointer.

Browse Source 
PodTemplateSpec should be consistent for all the types in extensions/v1beta1.

See PR #19510.
This commit is contained in:
Madhusudan.C.S
2016-03-09 13:11:13 -08:00
parent 108f722657
commit db48dcf583
22 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -730,7 +730,7 @@ func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployme
Spec: extensions.ReplicaSetSpec{
Replicas: 0,
Selector: newRSSelector,
Template: &newRSTemplate,
Template: newRSTemplate,
},
}
// Set new replica set's annotation
@@ -1100,9 +1100,9 @@ func (dc *DeploymentController) updateDeployment(deployment *extensions.Deployme
}
func (dc *DeploymentController) rollbackToTemplate(deployment *extensions.Deployment, rs *extensions.ReplicaSet) (d *extensions.Deployment, performedRollback bool, err error) {
if !reflect.DeepEqual(deploymentutil.GetNewReplicaSetTemplate(deployment), *rs.Spec.Template) {
if !reflect.DeepEqual(deploymentutil.GetNewReplicaSetTemplate(deployment), rs.Spec.Template) {
glog.Infof("Rolling back deployment %s to template spec %+v", deployment.Name, rs.Spec.Template.Spec)
deploymentutil.SetFromReplicaSetTemplate(deployment, *rs.Spec.Template)
deploymentutil.SetFromReplicaSetTemplate(deployment, rs.Spec.Template)
performedRollback = true
} else {
glog.V(4).Infof("Rolling back to a revision that contains the same template as current deployment %s, skipping rollback...", deployment.Name)

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

@@ -42,7 +42,7 @@ func rs(name string, replicas int, selector map[string]string) *exp.ReplicaSet {
Spec: exp.ReplicaSetSpec{
Replicas: replicas,
Selector: &unversioned.LabelSelector{MatchLabels: selector},
Template: &api.PodTemplateSpec{},
Template: api.PodTemplateSpec{},
},
}
}
@@ -120,7 +120,7 @@ func newReplicaSet(d *exp.Deployment, name string, replicas int) *exp.ReplicaSet
},
Spec: exp.ReplicaSetSpec{
Replicas: replicas,
Template: &d.Spec.Template,
Template: d.Spec.Template,
},
}