Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 14:41:10 +01:00
Code Packages Releases Activity

Merge pull request #471 from Mathew857/master

Browse Source 
refactor: remove unused code
This commit is contained in:
Kubernetes Prow Robot
2020-12-15 17:20:20 -08:00
committed by GitHub
parent 67df39690b 1a998037f8
commit f54df67d11
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/descheduler/descheduler.go
View File

@@ -96,7 +96,7 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
} }
wait.Until(func() { wait.Until(func() {
nodes, err := nodeutil.ReadyNodes(ctx, rs.Client, nodeInformer, nodeSelector, stopChannel) nodes, err := nodeutil.ReadyNodes(ctx, rs.Client, nodeInformer, nodeSelector)
if err != nil { if err != nil {
klog.V(1).InfoS("Unable to get ready nodes", "err", err) klog.V(1).InfoS("Unable to get ready nodes", "err", err)
close(stopChannel) close(stopChannel)

2
pkg/descheduler/node/node.go
View File

@@ -30,7 +30,7 @@ import (
// ReadyNodes returns ready nodes irrespective of whether they are // ReadyNodes returns ready nodes irrespective of whether they are
// schedulable or not. // schedulable or not.
func ReadyNodes(ctx context.Context, client clientset.Interface, nodeInformer coreinformers.NodeInformer, nodeSelector string, stopChannel <-chan struct{}) ([]*v1.Node, error) { func ReadyNodes(ctx context.Context, client clientset.Interface, nodeInformer coreinformers.NodeInformer, nodeSelector string) ([]*v1.Node, error) {
ns, err := labels.Parse(nodeSelector) ns, err := labels.Parse(nodeSelector)
if err != nil { if err != nil {
return []*v1.Node{}, err return []*v1.Node{}, err

2
pkg/descheduler/node/node_test.go
View File

@@ -74,7 +74,7 @@ func TestReadyNodesWithNodeSelector(t *testing.T) {
sharedInformerFactory.WaitForCacheSync(stopChannel) sharedInformerFactory.WaitForCacheSync(stopChannel)
defer close(stopChannel) defer close(stopChannel)
nodes, _ := ReadyNodes(ctx, fakeClient, nodeInformer, nodeSelector, nil) nodes, _ := ReadyNodes(ctx, fakeClient, nodeInformer, nodeSelector)
if nodes[0].Name != "node1" { if nodes[0].Name != "node1" {
t.Errorf("Expected node1, got %s", nodes[0].Name) t.Errorf("Expected node1, got %s", nodes[0].Name)

4
test/e2e/e2e_test.go
View File

@@ -106,7 +106,7 @@ func RcByNameContainer(name, namespace string, replicas int32, labels map[string
// startEndToEndForLowNodeUtilization tests the lownode utilization strategy. // startEndToEndForLowNodeUtilization tests the lownode utilization strategy.
func startEndToEndForLowNodeUtilization(ctx context.Context, clientset clientset.Interface, nodeInformer coreinformers.NodeInformer, podEvictor *evictions.PodEvictor) { func startEndToEndForLowNodeUtilization(ctx context.Context, clientset clientset.Interface, nodeInformer coreinformers.NodeInformer, podEvictor *evictions.PodEvictor) {
// Run descheduler. // Run descheduler.
nodes, err := nodeutil.ReadyNodes(ctx, clientset, nodeInformer, "", nil) nodes, err := nodeutil.ReadyNodes(ctx, clientset, nodeInformer, "")
if err != nil { if err != nil {
klog.Fatalf("%v", err) klog.Fatalf("%v", err)
} }
@@ -194,7 +194,7 @@ func runPodLifetimeStrategy(ctx context.Context, clientset clientset.Interface,
klog.Fatalf("%v", err) klog.Fatalf("%v", err)
} }
nodes, err := nodeutil.ReadyNodes(ctx, clientset, nodeInformer, "", nil) nodes, err := nodeutil.ReadyNodes(ctx, clientset, nodeInformer, "")
if err != nil { if err != nil {
klog.Fatalf("%v", err) klog.Fatalf("%v", err)
} }