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

Merge pull request #19893 from janetkuo/kubectl-rollout-history

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-02 01:13:15 -08:00
parent 71ae2736c0 8fb86a3d3b
commit 17a5058e83
13 changed files with 588 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,7 +452,7 @@ func (dc *DeploymentController) rollback(deployment *extensions.Deployment, toRe
}
}
for _, rc := range allRCs {
v, err := revision(rc)
v, err := deploymentutil.Revision(rc)
if err != nil {
glog.V(4).Infof("Unable to extract revision from deployment's rc %q: %v", rc.Name, err)
continue
@@ -618,18 +618,10 @@ func (dc *DeploymentController) getNewRCAndAllOldRCs(deployment extensions.Deplo
return dc.getNewRCAndMaybeFilteredOldRCs(deployment, false)
}
func revision(rc *api.ReplicationController) (int64, error) {
v, ok := rc.Annotations[deploymentutil.RevisionAnnotation]
if !ok {
return 0, nil
}
return strconv.ParseInt(v, 10, 64)
}
func maxRevision(allRCs []*api.ReplicationController) int64 {
max := int64(0)
for _, rc := range allRCs {
if v, err := revision(rc); err != nil {
if v, err := deploymentutil.Revision(rc); err != nil {
// Skip the RCs when it failed to parse their revision information
glog.V(4).Infof("Error: %v. Couldn't parse revision for rc %#v, deployment controller will skip it when reconciling revisions.", err, rc)
} else if v > max {
@@ -643,7 +635,7 @@ func maxRevision(allRCs []*api.ReplicationController) int64 {
func lastRevision(allRCs []*api.ReplicationController) int64 {
max, secMax := int64(0), int64(0)
for _, rc := range allRCs {
if v, err := revision(rc); err != nil {
if v, err := deploymentutil.Revision(rc); err != nil {
// Skip the RCs when it failed to parse their revision information
glog.V(4).Infof("Error: %v. Couldn't parse revision for rc %#v, deployment controller will skip it when reconciling revisions.", err, rc)
} else if v >= max {