Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 21:31:18 +01:00
Code Packages Releases Activity

Fix rescheduler's node implementation.

Browse Source
This commit is contained in:
Avesh Agarwal
2017-07-31 15:48:08 -04:00
parent 2217fcbd01
commit 5df7cb85d4
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/rescheduler/node/node.go
View File

@@ -20,6 +20,7 @@ import (
"fmt"
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
@@ -30,26 +31,37 @@ import (
// ReadyNodes returns ready nodes irrespective of whether they are
// schedulable or not.
func ReadyNodes(client clientset.Interface, stopChannel <-chan struct{}) ([]*v1.Node, error) {
nodes, err := nodeLister(client, stopChannel).List(labels.Everything())
func ReadyNodes(client clientset.Interface, stopChannel <-chan struct{}) ([]v1.Node, error) {
nl := getNodeLister(client, stopChannel)
nodes, err := nl.List(labels.Everything())
if err != nil {
return []*v1.Node{}, err
return []v1.Node{}, err
}
readyNodes := make([]*v1.Node, 0, len(nodes))
if len(nodes) == 0 {
var err error
nItems, err := client.Core().Nodes().List(metav1.ListOptions{})
if err != nil {
return []v1.Node{}, err
}
return nItems.Items, nil
}
readyNodes := make([]v1.Node, 0, len(nodes))
for _, node := range nodes {
if IsReady(node) {
readyNodes = append(readyNodes, node)
readyNodes = append(readyNodes, *node)
}
}
return readyNodes, nil
}
func nodeLister(client clientset.Interface, stopChannel <-chan struct{}) corelisters.NodeLister {
listWatcher := cache.NewListWatchFromClient(client.CoreV1().RESTClient(), "nodes", v1.NamespaceAll, fields.Everything())
func getNodeLister(client clientset.Interface, stopChannel <-chan struct{}) corelisters.NodeLister {
listWatcher := cache.NewListWatchFromClient(client.Core().RESTClient(), "nodes", v1.NamespaceAll, fields.Everything())
store := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
nodeLister := corelisters.NewNodeLister(store)
reflector := cache.NewReflector(listWatcher, &v1.Node{}, store, time.Hour)
reflector.RunUntil(stopChannel)
return nodeLister
}