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

Merge pull request #24856 from mwielgus/public_drain 

Make DrainOptions.getPodsForDeletion public to be reused in ClusterAutoscaler
pull/6/head
Wojciech Tyczynski 2016-04-27 13:00:57 +02:00
parent a907794ce3 41dde20410
commit 6b1e59e8c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/drain.go
View File

@ -183,7 +183,7 @@ func (o *DrainOptions) RunDrain() error {
return err
}
pods, err := o.getPodsForDeletion()
pods, err := o.GetPodsForDeletion()
if err != nil {
return err
}
@ -195,10 +195,10 @@ func (o *DrainOptions) RunDrain() error {
return nil
}
// getPodsForDeletion returns all the pods we're going to delete. If there are
// GetPodsForDeletion returns all the pods we're going to delete. If there are
// any unmanaged pods and the user didn't pass --force, we return that list in
// an error.
func (o *DrainOptions) getPodsForDeletion() ([]api.Pod, error) {
func (o *DrainOptions) GetPodsForDeletion() ([]api.Pod, error) {
pods := []api.Pod{}
podList, err := o.client.Pods(api.NamespaceAll).List(api.ListOptions{FieldSelector: fields.SelectorFromSet(fields.Set{"spec.nodeName": o.nodeInfo.Name})})
if err != nil {