github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

update annotations

Browse Source
This commit is contained in:
zhengjiajin 2017-03-14 20:03:31 +08:00
parent 5e29e1ee05
commit 996200b71e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/deployment/recreate.go
View File

@ -25,7 +25,7 @@ import (
// rolloutRecreate implements the logic for recreating a replica set. // 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 { 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) newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false)
if err != nil { if err != nil {
return err return err
@ -33,13 +33,13 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
allRSs := append(oldRSs, newRS) allRSs := append(oldRSs, newRS)
activeOldRSs := controller.FilterActiveReplicaSets(oldRSs) activeOldRSs := controller.FilterActiveReplicaSets(oldRSs)
// scale down old replica sets // scale down old replica sets.
scaledDown, err := dc.scaleDownOldReplicaSetsForRecreate(activeOldRSs, d) scaledDown, err := dc.scaleDownOldReplicaSetsForRecreate(activeOldRSs, d)
if err != nil { if err != nil {
return err return err
} }
if scaledDown { if scaledDown {
// Update DeploymentStatus // Update DeploymentStatus.
return dc.syncRolloutStatus(allRSs, newRS, d) 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. // TODO: Create a new RS without re-listing all RSs.
if newRS == nil { if newRS == nil {
newRS, oldRSs, err = dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, true) 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) allRSs = append(oldRSs, newRS)
} }
// scale up new replica set // scale up new replica set.
scaledUp, err := dc.scaleUpNewReplicaSetForRecreate(newRS, d) scaledUp, err := dc.scaleUpNewReplicaSetForRecreate(newRS, d)
if err != nil { if err != nil {
return err return err
} }
if scaledUp { if scaledUp {
// Update DeploymentStatus // Update DeploymentStatus.
return dc.syncRolloutStatus(allRSs, newRS, d) return dc.syncRolloutStatus(allRSs, newRS, d)
} }
// Sync deployment status // Sync deployment status.
return dc.syncRolloutStatus(allRSs, newRS, d) 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) { func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*extensions.ReplicaSet, deployment *extensions.Deployment) (bool, error) {
scaled := false scaled := false
for i := range oldRSs { for i := range oldRSs {
@ -98,7 +98,7 @@ func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*ext
return scaled, nil 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) { func (dc *DeploymentController) scaleUpNewReplicaSetForRecreate(newRS *extensions.ReplicaSet, deployment *extensions.Deployment) (bool, error) {
scaled, _, err := dc.scaleReplicaSetAndRecordEvent(newRS, *(deployment.Spec.Replicas), deployment) scaled, _, err := dc.scaleReplicaSetAndRecordEvent(newRS, *(deployment.Spec.Replicas), deployment)
return scaled, err return scaled, err