Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Allow Node strategies to run with informers #488

Closed
wants to merge 7 commits into from
Closed

[WIP] Allow Node strategies to run with informers #488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf30288
Add strategy controller types
damemi Jan 25, 2021
4c02bdc
Move strategy function definitions to strategies pkg
damemi Jan 25, 2021
3f80158
Add strategy RunMode setting
damemi Jan 25, 2021
cb756f0
Add strategy controller workqueue functions
damemi Jan 25, 2021
3861a73
Implement informers for Node strategies
damemi Jan 25, 2021
848180f
Update README with informed strategies
damemi Jan 25, 2021
f01c473
Pass strategy names to controller
damemi Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkg/descheduler/descheduler.go
View file
Open in desktop
Expand Up @@ -20,8 +20,6 @@ import (
"context"
"fmt"

v1 "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -60,16 +58,14 @@ func Run(rs *options.DeschedulerServer) error {
return RunDeschedulerStrategies(ctx, rs, deschedulerPolicy, evictionPolicyGroupVersion, stopChannel)
}

type strategyFunction func(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor)

func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string, stopChannel chan struct{}) error {
sharedInformerFactory := informers.NewSharedInformerFactory(rs.Client, 0)
nodeInformer := sharedInformerFactory.Core().V1().Nodes()

sharedInformerFactory.Start(stopChannel)
sharedInformerFactory.WaitForCacheSync(stopChannel)

strategyFuncs := map[string]strategyFunction{
strategyFuncs := map[string]strategies.StrategyFunction{
"RemoveDuplicates": strategies.RemoveDuplicatePods,
"LowNodeUtilization": strategies.LowNodeUtilization,
"RemovePodsViolatingInterPodAntiAffinity": strategies.RemovePodsViolatingInterPodAntiAffinity,
Expand Down
34 changes: 34 additions & 0 deletions pkg/descheduler/strategies/types.go
View file
Open in desktop
@@ -0,0 +1,34 @@
package strategies

import (
"context"
v1 "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/util/workqueue"
"sigs.k8s.io/descheduler/pkg/api"
"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
)

// StrategyFunction defines the function signature for each strategy's main function
type StrategyFunction func(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather keep this type private until we discuss how to refactor the way strategies are initialized.

ctx context.Context,
client clientset.Interface,
strategy api.DeschedulerStrategy,
nodes []*v1.Node,
podEvictor *evictions.PodEvictor,
)

// StrategyController is a controller responsible for running an individual strategy, used with informed strategies
type StrategyController struct {
ctx context.Context
client clientset.Interface
queue workqueue.RateLimitingInterface
f StrategyFunction
}

// StrategyControllerFunction defines the function signature to return a StrategyController
type StrategyControllerFunction func(
ctx context.Context,
client clientset.Interface,
f StrategyFunction,
) *StrategyController