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

Merge pull request #30129 from lixiaobing10051267/masterName

Browse Source 
Automatic merge from submit-queue

make correction to two variables in inverse order

from Fprintf info ""Renaming %s to %s\n", it should be renamed from old to new.
This commit is contained in:
Kubernetes Submit Queue 2016-08-06 03:01:14 -07:00 committed by GitHub
commit b91de274c7
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

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