github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

use unconditional update and check error of update in DaemonSet reaper

Browse Source
This commit is contained in:
Mike Danese 2015-10-05 14:14:22 -07:00
parent 26fafb4c4b
commit 334b551166
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/stop.go
View File

@ -183,7 +183,7 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string, timeout
} }
func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) (string, error) { func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) (string, error) {
daemon, err := reaper.Experimental().DaemonSets(namespace).Get(name) ds, err := reaper.Experimental().DaemonSets(namespace).Get(name)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -208,9 +208,13 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
return "", fmt.Errorf("Name collision generating an unused node name. Please retry this operation.") return "", fmt.Errorf("Name collision generating an unused node name. Please retry this operation.")
} }
daemon.Spec.Template.Spec.NodeName = nodeName ds.Spec.Template.Spec.NodeName = nodeName
// force update to avoid version conflict
ds.ResourceVersion = ""
reaper.Experimental().DaemonSets(namespace).Update(daemon) if ds, err = reaper.Experimental().DaemonSets(namespace).Update(ds); err != nil {
return "", err
}
// Wait for the daemon set controller to kill all the daemon pods. // Wait for the daemon set controller to kill all the daemon pods.
if err := wait.Poll(reaper.pollInterval, reaper.timeout, func() (bool, error) { if err := wait.Poll(reaper.pollInterval, reaper.timeout, func() (bool, error) {