diff --git a/pkg/controller/deployment/recreate.go b/pkg/controller/deployment/recreate.go index 9499cc37dd..916649de9e 100644 --- a/pkg/controller/deployment/recreate.go +++ b/pkg/controller/deployment/recreate.go @@ -25,7 +25,7 @@ import ( // rolloutRecreate implements the logic for recreating a replica set. func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList []*extensions.ReplicaSet, podMap map[types.UID]*v1.PodList) error { - // Don't create a new RS if not already existed, so that we avoid scaling up before scaling down + // Don't create a new RS if not already existed, so that we avoid scaling up before scaling down. newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false) if err != nil { return err @@ -33,13 +33,13 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList allRSs := append(oldRSs, newRS) activeOldRSs := controller.FilterActiveReplicaSets(oldRSs) - // scale down old replica sets + // scale down old replica sets. scaledDown, err := dc.scaleDownOldReplicaSetsForRecreate(activeOldRSs, d) if err != nil { return err } if scaledDown { - // Update DeploymentStatus + // Update DeploymentStatus. return dc.syncRolloutStatus(allRSs, newRS, d) } @@ -53,7 +53,7 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList } } - // If we need to create a new RS, create it now + // If we need to create a new RS, create it now. // TODO: Create a new RS without re-listing all RSs. if newRS == nil { newRS, oldRSs, err = dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, true) @@ -63,21 +63,21 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList allRSs = append(oldRSs, newRS) } - // scale up new replica set + // scale up new replica set. scaledUp, err := dc.scaleUpNewReplicaSetForRecreate(newRS, d) if err != nil { return err } if scaledUp { - // Update DeploymentStatus + // Update DeploymentStatus. return dc.syncRolloutStatus(allRSs, newRS, d) } - // Sync deployment status + // Sync deployment status. return dc.syncRolloutStatus(allRSs, newRS, d) } -// scaleDownOldReplicaSetsForRecreate scales down old replica sets when deployment strategy is "Recreate" +// scaleDownOldReplicaSetsForRecreate scales down old replica sets when deployment strategy is "Recreate". func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*extensions.ReplicaSet, deployment *extensions.Deployment) (bool, error) { scaled := false for i := range oldRSs { @@ -98,7 +98,7 @@ func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*ext return scaled, nil } -// scaleUpNewReplicaSetForRecreate scales up new replica set when deployment strategy is "Recreate" +// scaleUpNewReplicaSetForRecreate scales up new replica set when deployment strategy is "Recreate". func (dc *DeploymentController) scaleUpNewReplicaSetForRecreate(newRS *extensions.ReplicaSet, deployment *extensions.Deployment) (bool, error) { scaled, _, err := dc.scaleReplicaSetAndRecordEvent(newRS, *(deployment.Spec.Replicas), deployment) return scaled, err