github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15110 from mikedanese/ds-reaper-fix 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-05 22:28:51 -07:00
parent 3902f76512 334b551166
commit 239790a045
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) {
daemon, err := reaper.Experimental().DaemonSets(namespace).Get(name)
ds, err := reaper.Experimental().DaemonSets(namespace).Get(name)
if err != nil {
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.")
}
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.
if err := wait.Poll(reaper.pollInterval, reaper.timeout, func() (bool, error) {