add v1alpha2 registry based conversion #1006
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -15,3 +15,230 @@ limitations under the License. | |||||
| */ | ||||||
|
|
||||||
| package v1alpha1 | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "fmt" | ||||||
|
|
||||||
| v1 "k8s.io/api/core/v1" | ||||||
| "k8s.io/client-go/informers" | ||||||
| clientset "k8s.io/client-go/kubernetes" | ||||||
| "k8s.io/klog/v2" | ||||||
| "sigs.k8s.io/descheduler/pkg/api" | ||||||
| "sigs.k8s.io/descheduler/pkg/descheduler/evictions" | ||||||
| podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod" | ||||||
| "sigs.k8s.io/descheduler/pkg/framework" | ||||||
| "sigs.k8s.io/descheduler/pkg/framework/pluginregistry" | ||||||
| "sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor" | ||||||
| "sigs.k8s.io/descheduler/pkg/utils" | ||||||
| ) | ||||||
|
|
||||||
| // evictorImpl implements the Evictor interface so plugins | ||||||
| // can evict a pod without importing a specific pod evictor | ||||||
| type evictorImpl struct { | ||||||
|
There was a problem hiding this comment. Why do There was a problem hiding this comment. I moved things here by Mike's request: #1006 (comment) These lines need it. And I can't import it from somewhere else since basically all other packages import v1alpha1 and this would generate a cycle. When this was back at policyconfig.go we could just use it. |
||||||
| podEvictor *evictions.PodEvictor | ||||||
| evictorFilter framework.EvictorPlugin | ||||||
| } | ||||||
|
|
||||||
| var _ framework.Evictor = &evictorImpl{} | ||||||
|
|
||||||
| // Filter checks if a pod can be evicted | ||||||
| func (ei *evictorImpl) Filter(pod *v1.Pod) bool { | ||||||
| return ei.evictorFilter.Filter(pod) | ||||||
| } | ||||||
|
|
||||||
| // PreEvictionFilter checks if pod can be evicted right before eviction | ||||||
| func (ei *evictorImpl) PreEvictionFilter(pod *v1.Pod) bool { | ||||||
| return ei.evictorFilter.PreEvictionFilter(pod) | ||||||
| } | ||||||
|
|
||||||
| // Evict evicts a pod (no pre-check performed) | ||||||
| func (ei *evictorImpl) Evict(ctx context.Context, pod *v1.Pod, opts evictions.EvictOptions) bool { | ||||||
| return ei.podEvictor.EvictPod(ctx, pod, opts) | ||||||
| } | ||||||
|
|
||||||
| func (ei *evictorImpl) NodeLimitExceeded(node *v1.Node) bool { | ||||||
| return ei.podEvictor.NodeLimitExceeded(node) | ||||||
| } | ||||||
|
|
||||||
| // handleImpl implements the framework handle which gets passed to plugins | ||||||
| type handleImpl struct { | ||||||
| clientSet clientset.Interface | ||||||
| getPodsAssignedToNodeFunc podutil.GetPodsAssignedToNodeFunc | ||||||
| sharedInformerFactory informers.SharedInformerFactory | ||||||
| evictor *evictorImpl | ||||||
| } | ||||||
|
|
||||||
| var _ framework.Handle = &handleImpl{} | ||||||
|
|
||||||
| // ClientSet retrieves kube client set | ||||||
| func (hi *handleImpl) ClientSet() clientset.Interface { | ||||||
| return hi.clientSet | ||||||
| } | ||||||
|
|
||||||
| // GetPodsAssignedToNodeFunc retrieves GetPodsAssignedToNodeFunc implementation | ||||||
| func (hi *handleImpl) GetPodsAssignedToNodeFunc() podutil.GetPodsAssignedToNodeFunc { | ||||||
| return hi.getPodsAssignedToNodeFunc | ||||||
| } | ||||||
|
|
||||||
| // SharedInformerFactory retrieves shared informer factory | ||||||
| func (hi *handleImpl) SharedInformerFactory() informers.SharedInformerFactory { | ||||||
| return hi.sharedInformerFactory | ||||||
| } | ||||||
|
|
||||||
| // Evictor retrieves evictor so plugins can filter and evict pods | ||||||
| func (hi *handleImpl) Evictor() framework.Evictor { | ||||||
| return hi.evictor | ||||||
| } | ||||||
|
|
||||||
| func V1alpha1ToInternal( | ||||||
| client clientset.Interface, | ||||||
| deschedulerPolicy *DeschedulerPolicy, | ||||||
| registry pluginregistry.Registry, | ||||||
| ) (*api.DeschedulerPolicy, error) { | ||||||
| var evictLocalStoragePods bool | ||||||
| if deschedulerPolicy.EvictLocalStoragePods != nil { | ||||||
| evictLocalStoragePods = *deschedulerPolicy.EvictLocalStoragePods | ||||||
| } | ||||||
|
|
||||||
| evictBarePods := false | ||||||
| if deschedulerPolicy.EvictFailedBarePods != nil { | ||||||
| evictBarePods = *deschedulerPolicy.EvictFailedBarePods | ||||||
| if evictBarePods { | ||||||
| klog.V(1).InfoS("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.") | ||||||
|
There was a problem hiding this comment. no
Suggested change
|
||||||
| } | ||||||
| } | ||||||
|
|
||||||
| evictSystemCriticalPods := false | ||||||
| if deschedulerPolicy.EvictSystemCriticalPods != nil { | ||||||
| evictSystemCriticalPods = *deschedulerPolicy.EvictSystemCriticalPods | ||||||
| if evictSystemCriticalPods { | ||||||
| klog.V(1).InfoS("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.") | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| } | ||||||
|
|
||||||
| ignorePvcPods := false | ||||||
| if deschedulerPolicy.IgnorePVCPods != nil { | ||||||
| ignorePvcPods = *deschedulerPolicy.IgnorePVCPods | ||||||
| } | ||||||
|
|
||||||
| var profiles []api.Profile | ||||||
|
|
||||||
| // Build profiles | ||||||
| for name, strategy := range deschedulerPolicy.Strategies { | ||||||
| if _, ok := pluginregistry.PluginRegistry[string(name)]; ok { | ||||||
| if strategy.Enabled { | ||||||
| params := strategy.Params | ||||||
| if params == nil { | ||||||
| params = &StrategyParameters{} | ||||||
| } | ||||||
|
|
||||||
| nodeFit := false | ||||||
| if name != "PodLifeTime" { | ||||||
| nodeFit = params.NodeFit | ||||||
| } | ||||||
|
|
||||||
| if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" { | ||||||
| klog.ErrorS(fmt.Errorf("priority threshold misconfigured"), "only one of priorityThreshold fields can be set", "pluginName", name) | ||||||
| return nil, fmt.Errorf("priority threshold misconfigured for plugin %v", name) | ||||||
| } | ||||||
|
|
||||||
| var priorityThreshold *api.PriorityThreshold | ||||||
| if strategy.Params != nil { | ||||||
| priorityThreshold = &api.PriorityThreshold{ | ||||||
| Value: strategy.Params.ThresholdPriority, | ||||||
| Name: strategy.Params.ThresholdPriorityClassName, | ||||||
| } | ||||||
| } | ||||||
| thresholdPriority, err := utils.GetPriorityFromStrategyParams(context.TODO(), client, priorityThreshold) | ||||||
| if err != nil { | ||||||
| klog.ErrorS(err, "Failed to get threshold priority from strategy's params") | ||||||
| return nil, fmt.Errorf("failed to get threshold priority from strategy's params: %v", err) | ||||||
| } | ||||||
|
|
||||||
| var pluginConfig *api.PluginConfig | ||||||
| if pcFnc, exists := StrategyParamsToPluginArgs[string(name)]; exists { | ||||||
| pluginConfig, err = pcFnc(params) | ||||||
| if err != nil { | ||||||
| klog.ErrorS(err, "skipping strategy", "strategy", name) | ||||||
| return nil, fmt.Errorf("failed to get plugin config for strategy %v: %v", name, err) | ||||||
| } | ||||||
| } else { | ||||||
| klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name) | ||||||
| return nil, fmt.Errorf("unknown strategy name: %v", name) | ||||||
| } | ||||||
|
|
||||||
| profile := api.Profile{ | ||||||
| Name: fmt.Sprintf("strategy-%v-profile", name), | ||||||
| PluginConfigs: []api.PluginConfig{ | ||||||
| { | ||||||
| Name: defaultevictor.PluginName, | ||||||
| Args: &defaultevictor.DefaultEvictorArgs{ | ||||||
| EvictLocalStoragePods: evictLocalStoragePods, | ||||||
| EvictSystemCriticalPods: evictSystemCriticalPods, | ||||||
| IgnorePvcPods: ignorePvcPods, | ||||||
| EvictFailedBarePods: evictBarePods, | ||||||
| NodeFit: nodeFit, | ||||||
| PriorityThreshold: &api.PriorityThreshold{ | ||||||
| Value: &thresholdPriority, | ||||||
| }, | ||||||
| }, | ||||||
| }, | ||||||
| *pluginConfig, | ||||||
| }, | ||||||
| Plugins: api.Plugins{ | ||||||
| Evict: api.PluginSet{ | ||||||
| Enabled: []string{defaultevictor.PluginName}, | ||||||
| }, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| pluginArgs := registry[string(name)].PluginArgInstance | ||||||
| pluginInstance, err := registry[string(name)].PluginBuilder(pluginArgs, &handleImpl{}) | ||||||
| if err != nil { | ||||||
| klog.ErrorS(fmt.Errorf("could not build plugin"), "plugin build error", "plugin", name) | ||||||
| return nil, fmt.Errorf("could not build plugin: %v", name) | ||||||
| } | ||||||
|
|
||||||
| // pluginInstance can be of any of each type, or both | ||||||
| profilePlugins := profile.Plugins | ||||||
| profile.Plugins = enableProfilePluginsByType(profilePlugins, pluginInstance, pluginConfig) | ||||||
| profiles = append(profiles, profile) | ||||||
| } | ||||||
| } else { | ||||||
| klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name) | ||||||
| return nil, fmt.Errorf("unknown strategy name: %v", name) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return &api.DeschedulerPolicy{ | ||||||
| Profiles: profiles, | ||||||
| NodeSelector: deschedulerPolicy.NodeSelector, | ||||||
| MaxNoOfPodsToEvictPerNode: deschedulerPolicy.MaxNoOfPodsToEvictPerNode, | ||||||
| MaxNoOfPodsToEvictPerNamespace: deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace, | ||||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
| func enableProfilePluginsByType(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins { | ||||||
| profilePlugins = checkBalance(profilePlugins, pluginInstance, pluginConfig) | ||||||
| profilePlugins = checkDeschedule(profilePlugins, pluginInstance, pluginConfig) | ||||||
| return profilePlugins | ||||||
| } | ||||||
|
|
||||||
| func checkBalance(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins { | ||||||
| _, ok := pluginInstance.(framework.BalancePlugin) | ||||||
| if ok { | ||||||
| klog.V(3).Info("converting Balance plugin: %s", pluginInstance.Name()) | ||||||
| profilePlugins.Balance.Enabled = []string{pluginConfig.Name} | ||||||
| } | ||||||
| return profilePlugins | ||||||
| } | ||||||
|
|
||||||
| func checkDeschedule(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins { | ||||||
| _, ok := pluginInstance.(framework.DeschedulePlugin) | ||||||
| if ok { | ||||||
| klog.V(3).Info("converting Deschedule plugin: %s", pluginInstance.Name()) | ||||||
| profilePlugins.Deschedule.Enabled = []string{pluginConfig.Name} | ||||||
| } | ||||||
| return profilePlugins | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hate to do this, but these need to be updated to 2023 now in each new file