github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117649 from SataQiu/scheduler-remove-v1beta2-20230427

Browse Source 
scheduler: remove deprecated v1beta2 KubeSchedulerConfiguration  component config
This commit is contained in:
Kubernetes Prow Robot
2023-05-03 09:54:41 -07:00
committed by GitHub
parent 44e3306323 1f7c07f355
commit 47f1bd9f80
31 changed files with 12 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go
View File

@@ -37,10 +37,10 @@ import (
clienttesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2/ktesting"
kubeschedulerconfigv1beta2 "k8s.io/kube-scheduler/config/v1beta2"
kubeschedulerconfigv1 "k8s.io/kube-scheduler/config/v1"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
configv1beta2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2"
configv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1"
"k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/parallelize"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
@@ -88,10 +88,10 @@ var (
)
func getDefaultDefaultPreemptionArgs() *config.DefaultPreemptionArgs {
v1beta2dpa := &kubeschedulerconfigv1beta2.DefaultPreemptionArgs{}
configv1beta2.SetDefaults_DefaultPreemptionArgs(v1beta2dpa)
v1dpa := &kubeschedulerconfigv1.DefaultPreemptionArgs{}
configv1.SetDefaults_DefaultPreemptionArgs(v1dpa)
dpa := &config.DefaultPreemptionArgs{}
configv1beta2.Convert_v1beta2_DefaultPreemptionArgs_To_config_DefaultPreemptionArgs(v1beta2dpa, dpa, nil)
configv1.Convert_v1_DefaultPreemptionArgs_To_config_DefaultPreemptionArgs(v1dpa, dpa, nil)
return dpa
}