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

cleanup-policy

Browse Source
This commit is contained in:
mqliang
2016-01-28 14:13:07 +08:00
parent d63398a543
commit c5cda2012a
14 changed files with 10224 additions and 9851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,11 +19,12 @@ package deployment
import (
"fmt"
"math"
"sort"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/record"
@@ -34,6 +35,7 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
deploymentutil "k8s.io/kubernetes/pkg/util/deployment"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
labelsutil "k8s.io/kubernetes/pkg/util/labels"
podutil "k8s.io/kubernetes/pkg/util/pod"
"k8s.io/kubernetes/pkg/util/workqueue"
@@ -457,6 +459,11 @@ func (dc *DeploymentController) syncRecreateDeployment(deployment extensions.Dep
return dc.updateDeploymentStatus(allRCs, newRC, deployment)
}
if deployment.Spec.RevisionHistoryLimit != nil {
// Cleanup old RCs
dc.cleanupOldRcs(oldRCs, deployment)
}
// Sync deployment status
return dc.syncDeploymentStatus(allRCs, newRC, deployment)
@@ -496,6 +503,11 @@ func (dc *DeploymentController) syncRollingUpdateDeployment(deployment extension
return dc.updateDeploymentStatus(allRCs, newRC, deployment)
}
if deployment.Spec.RevisionHistoryLimit != nil {
// Cleanup old RCs
dc.cleanupOldRcs(oldRCs, deployment)
}
// Sync deployment status
return dc.syncDeploymentStatus(allRCs, newRC, deployment)
@@ -706,6 +718,31 @@ func (dc *DeploymentController) scaleUpNewRCForRecreate(newRC *api.ReplicationCo
return true, err
}
func (dc *DeploymentController) cleanupOldRcs(oldRCs []*api.ReplicationController, deployment extensions.Deployment) error {
diff := len(oldRCs) - *deployment.Spec.RevisionHistoryLimit
if diff <= 0 {
return nil
}
sort.Sort(controller.ControllersByCreationTimestamp(oldRCs))
var errList []error
// TODO: This should be parallelized.
for i := 0; i < diff; i++ {
controller := oldRCs[i]
// Avoid delete rc with non-zero replica counts
if controller.Spec.Replicas != 0 || controller.Generation > controller.Status.ObservedGeneration {
continue
}
if err := dc.client.ReplicationControllers(controller.Namespace).Delete(controller.Name); err != nil && !errors.IsNotFound(err) {
glog.V(2).Infof("Failed deleting old rc %v for deployment %v: %v", controller.Name, deployment.Name, err)
errList = append(errList, err)
}
}
return utilerrors.NewAggregate(errList)
}
func (dc *DeploymentController) updateDeploymentStatus(allRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment extensions.Deployment) error {
totalReplicas, updatedReplicas, availableReplicas, unavailableReplicas, err := dc.calculateStatus(allRCs, newRC, deployment)
if err != nil {