scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31449 from janetkuo/return-deployment-rollback

Browse Source 
Automatic merge from submit-queue

Use updated deployment after rollback

@kubernetes/deployment 

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2016-08-26 06:49:06 -07:00
committed by GitHub
parent f2ec08d852 6e86a20304
commit 68f54756c2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,7 +518,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
if d.Spec.RollbackTo != nil { if d.Spec.RollbackTo != nil {
revision := d.Spec.RollbackTo.Revision revision := d.Spec.RollbackTo.Revision
if _, err = dc.rollback(d, &revision); err != nil { if d, err = dc.rollback(d, &revision); err != nil {
return err return err
} }
} }