mirror of https://github.com/k3s-io/k3s
Node controller change to use field selector
parent
bf8f258471
commit
4b5f851520
|
@ -651,12 +651,13 @@ func (nc *NodeController) getCloudNodesWithSpec() (*api.NodeList, error) {
|
||||||
// deletePods will delete all pods from master running on given node.
|
// deletePods will delete all pods from master running on given node.
|
||||||
func (nc *NodeController) deletePods(nodeID string) error {
|
func (nc *NodeController) deletePods(nodeID string) error {
|
||||||
glog.V(2).Infof("Delete all pods from %v", nodeID)
|
glog.V(2).Infof("Delete all pods from %v", nodeID)
|
||||||
// TODO: We don't yet have field selectors from client, see issue #1362.
|
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(),
|
||||||
pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything())
|
fields.OneTermEqualSelector(client.PodHost, nodeID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, pod := range pods.Items {
|
for _, pod := range pods.Items {
|
||||||
|
// Defensive check, also needed for tests.
|
||||||
if pod.Spec.Host != nodeID {
|
if pod.Spec.Host != nodeID {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue