github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37096 from andor-pierdelacabeza/patch-1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38260, 32811, 28458, 33570, 37096)

Fix renaming order shown on terminal
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 02:11:26 -08:00 committed by GitHub
commit b650149ee1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/rolling_updater.go
View File

@ -525,7 +525,7 @@ func (r *RollingUpdater) cleanupWithClients(oldRc, newRc *api.ReplicationControl
if err := r.rcClient.ReplicationControllers(r.ns).Delete(oldRc.Name, nil); err != nil { if err := r.rcClient.ReplicationControllers(r.ns).Delete(oldRc.Name, nil); err != nil {
return err return err
} }
fmt.Fprintf(config.Out, "Renaming %s to %s\n", oldRc.Name, newRc.Name) fmt.Fprintf(config.Out, "Renaming %s to %s\n", newRc.Name, oldRc.Name)
return Rename(r.rcClient, newRc, oldRc.Name) return Rename(r.rcClient, newRc, oldRc.Name)
case PreserveRollingUpdateCleanupPolicy: case PreserveRollingUpdateCleanupPolicy:
return nil return nil