From 283b176102d239a98f5cb070040935f23e477888 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Mon, 4 Oct 2021 13:55:00 -0400 Subject: [PATCH] [test]: modify integration tests to use v1beta3 --- test/integration/scheduler/framework_test.go | 176 +++++++++--------- test/integration/scheduler/preemption_test.go | 16 +- test/integration/scheduler/priorities_test.go | 14 +- test/integration/scheduler/queue_test.go | 12 +- test/integration/scheduler/scheduler_test.go | 22 +-- test/integration/scheduler/util.go | 12 +- 6 files changed, 126 insertions(+), 126 deletions(-) diff --git a/test/integration/scheduler/framework_test.go b/test/integration/scheduler/framework_test.go index 612e4b494c0..b819c783daf 100644 --- a/test/integration/scheduler/framework_test.go +++ b/test/integration/scheduler/framework_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" listersv1 "k8s.io/client-go/listers/core/v1" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" "k8s.io/kubernetes/pkg/scheduler" schedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing" @@ -540,12 +540,12 @@ func TestPreFilterPlugin(t *testing.T) { registry := frameworkruntime.Registry{prefilterPluginName: newPlugin(preFilterPlugin)} // Setup initial prefilter plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PreFilter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PreFilter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: prefilterPluginName}, }, }, @@ -685,32 +685,32 @@ func TestPostFilterPlugin(t *testing.T) { } // Setup plugins for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Filter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Filter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, }, }, - Score: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Score: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: scorePluginName}, }, // disable default in-tree Score plugins // to make it easy to control configured ScorePlugins failure - Disabled: []v1beta2.Plugin{ + Disabled: []v1beta3.Plugin{ {Name: "*"}, }, }, - PostFilter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + PostFilter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: postfilterPluginName}, }, // Need to disable default in-tree PostFilter plugins, as they will // call RunFilterPlugins and hence impact the "numFilterCalled". - Disabled: []v1beta2.Plugin{ + Disabled: []v1beta3.Plugin{ {Name: "*"}, }, }, @@ -773,12 +773,12 @@ func TestScorePlugin(t *testing.T) { scorePluginName: newPlugin(scorePlugin), } - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Score: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Score: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: scorePluginName}, }, }, @@ -851,12 +851,12 @@ func TestNormalizeScorePlugin(t *testing.T) { } // Setup initial score plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Score: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Score: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: scoreWithNormalizePluginName}, }, }, @@ -898,12 +898,12 @@ func TestReservePluginReserve(t *testing.T) { registry := frameworkruntime.Registry{reservePluginName: newPlugin(reservePlugin)} // Setup initial reserve plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Reserve: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Reserve: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: reservePluginName}, }, }, @@ -975,13 +975,13 @@ func TestPrebindPlugin(t *testing.T) { // Setup initial prebind and filter plugin in different profiles. // The second profile ensures the embedded filter plugin is exclusively called, and hence // we can use its internal `numFilterCalled` to perform some precise checking logic. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{ { SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PreBind: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PreBind: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: preBindPluginName}, }, }, @@ -989,9 +989,9 @@ func TestPrebindPlugin(t *testing.T) { }, { SchedulerName: pointer.StringPtr("2nd-scheduler"), - Plugins: &v1beta2.Plugins{ - Filter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Filter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, }, }, @@ -1255,20 +1255,20 @@ func TestBindPlugin(t *testing.T) { } // Setup initial unreserve and bind plugins for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Reserve: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{{Name: reservePlugin.Name()}}, + Plugins: &v1beta3.Plugins{ + Reserve: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{{Name: reservePlugin.Name()}}, }, - Bind: v1beta2.PluginSet{ + Bind: v1beta3.PluginSet{ // Put DefaultBinder last. - Enabled: []v1beta2.Plugin{{Name: bindPlugin1.Name()}, {Name: bindPlugin2.Name()}, {Name: defaultbinder.Name}}, - Disabled: []v1beta2.Plugin{{Name: defaultbinder.Name}}, + Enabled: []v1beta3.Plugin{{Name: bindPlugin1.Name()}, {Name: bindPlugin2.Name()}, {Name: defaultbinder.Name}}, + Disabled: []v1beta3.Plugin{{Name: defaultbinder.Name}}, }, - PostBind: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{{Name: postBindPlugin.Name()}}, + PostBind: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{{Name: postBindPlugin.Name()}}, }, }, }}, @@ -1444,19 +1444,19 @@ func TestPostBindPlugin(t *testing.T) { } // Setup initial prebind and postbind plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PreBind: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PreBind: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ { Name: preBindPluginName, }, }, }, - PostBind: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + PostBind: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ { Name: postBindPluginName, }, @@ -1792,12 +1792,12 @@ func TestFilterPlugin(t *testing.T) { registry := frameworkruntime.Registry{filterPluginName: newPlugin(filterPlugin)} // Setup initial filter plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Filter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Filter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, }, }, @@ -1864,12 +1864,12 @@ func TestPreScorePlugin(t *testing.T) { registry := frameworkruntime.Registry{preScorePluginName: newPlugin(preScorePlugin)} // Setup initial pre-score plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PreScore: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PreScore: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: preScorePluginName}, }, }, @@ -1945,24 +1945,24 @@ func TestPreemptWithPermitPlugin(t *testing.T) { } // Setup initial permit and filter plugins in the profile. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{ { SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Permit: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Permit: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: permitPluginName}, }, }, - Filter: v1beta2.PluginSet{ + Filter: v1beta3.PluginSet{ // Ensure the fake filter plugin is always called; otherwise noderesources // would fail first and exit the Filter phase. - Enabled: []v1beta2.Plugin{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, {Name: noderesources.FitName}, }, - Disabled: []v1beta2.Plugin{ + Disabled: []v1beta3.Plugin{ {Name: noderesources.FitName}, }, }, @@ -2194,17 +2194,17 @@ func TestActivatePods(t *testing.T) { }} // Setup initial filter plugin for testing. - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PreFilter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PreFilter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: jobPluginName}, }, }, - PostBind: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + PostBind: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: jobPluginName}, }, }, @@ -2281,19 +2281,19 @@ func initRegistryAndConfig(t *testing.T, pp ...*PermitPlugin) (frameworkruntime. return frameworkruntime.Registry{}, schedulerconfig.KubeSchedulerProfile{} } - versionedCfg := v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + versionedCfg := v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Permit: v1beta2.PluginSet{}, + Plugins: &v1beta3.Plugins{ + Permit: v1beta3.PluginSet{}, }, }}, } registry = frameworkruntime.Registry{} for _, p := range pp { registry.Register(p.Name(), newPermitPlugin(p)) - versionedCfg.Profiles[0].Plugins.Permit.Enabled = append(versionedCfg.Profiles[0].Plugins.Permit.Enabled, v1beta2.Plugin{Name: p.Name()}) + versionedCfg.Profiles[0].Plugins.Permit.Enabled = append(versionedCfg.Profiles[0].Plugins.Permit.Enabled, v1beta3.Plugin{Name: p.Name()}) } - cfg := configtesting.V1beta2ToInternalWithDefaults(t, versionedCfg) + cfg := configtesting.V1beta3ToInternalWithDefaults(t, versionedCfg) return registry, cfg.Profiles[0] } diff --git a/test/integration/scheduler/preemption_test.go b/test/integration/scheduler/preemption_test.go index f5e84f19ec8..69492ec91f6 100644 --- a/test/integration/scheduler/preemption_test.go +++ b/test/integration/scheduler/preemption_test.go @@ -40,7 +40,7 @@ import ( restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/features" @@ -134,17 +134,17 @@ func TestPreemption(t *testing.T) { if err != nil { t.Fatalf("Error registering a filter: %v", err) } - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Filter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Filter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, }, }, - PreFilter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + PreFilter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: filterPluginName}, }, }, diff --git a/test/integration/scheduler/priorities_test.go b/test/integration/scheduler/priorities_test.go index 65f4c2e0930..cb93f5f698a 100644 --- a/test/integration/scheduler/priorities_test.go +++ b/test/integration/scheduler/priorities_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler" configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing" @@ -45,15 +45,15 @@ import ( // This file tests the scheduler priority functions. func initTestSchedulerForPriorityTest(t *testing.T, scorePluginName string) *testutils.TestContext { - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Score: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Score: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: scorePluginName, Weight: pointer.Int32Ptr(1)}, }, - Disabled: []v1beta2.Plugin{ + Disabled: []v1beta3.Plugin{ {Name: "*"}, }, }, diff --git a/test/integration/scheduler/queue_test.go b/test/integration/scheduler/queue_test.go index 891d09fbb8d..68a515336cf 100644 --- a/test/integration/scheduler/queue_test.go +++ b/test/integration/scheduler/queue_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/scheduler" configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing" @@ -126,12 +126,12 @@ func TestCustomResourceEnqueue(t *testing.T) { return &fakeCRPlugin{}, nil }, } - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - Filter: v1beta2.PluginSet{ - Enabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + Filter: v1beta3.PluginSet{ + Enabled: []v1beta3.Plugin{ {Name: "fakeCRPlugin"}, }, }, diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 734e28c6dd4..d01ec2caea3 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -37,7 +37,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/events" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/apis/config" configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing" @@ -320,14 +320,14 @@ func TestSchedulerCreationFromNonExistentConfigMap(t *testing.T) { stopCh := make(chan struct{}) eventBroadcaster.StartRecordingToSink(stopCh) - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - PluginConfig: []v1beta2.PluginConfig{ + PluginConfig: []v1beta3.PluginConfig{ { Name: "VolumeBinding", Args: runtime.RawExtension{ - Object: &v1beta2.VolumeBindingArgs{ + Object: &v1beta3.VolumeBindingArgs{ BindTimeoutSeconds: pointer.Int64Ptr(30), }, }, @@ -558,14 +558,14 @@ func TestMultipleSchedulers(t *testing.T) { } // 5. create and start a scheduler with name "foo-scheduler" - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(fooScheduler), - PluginConfig: []v1beta2.PluginConfig{ + PluginConfig: []v1beta3.PluginConfig{ { Name: "VolumeBinding", Args: runtime.RawExtension{ - Object: &v1beta2.VolumeBindingArgs{ + Object: &v1beta3.VolumeBindingArgs{ BindTimeoutSeconds: pointer.Int64Ptr(30), }, }, @@ -634,8 +634,8 @@ func TestMultipleSchedulers(t *testing.T) { } func TestMultipleSchedulingProfiles(t *testing.T) { - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{ {SchedulerName: pointer.StringPtr("default-scheduler")}, {SchedulerName: pointer.StringPtr("custom-scheduler")}, }, diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index dc43ae1b285..f784bc51823 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -35,7 +35,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/restmapper" "k8s.io/client-go/scale" - "k8s.io/kube-scheduler/config/v1beta2" + "k8s.io/kube-scheduler/config/v1beta3" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller/disruption" "k8s.io/kubernetes/pkg/scheduler" @@ -93,12 +93,12 @@ func initTest(t *testing.T, nsPrefix string, opts ...scheduler.Option) *testutil // initTestDisablePreemption initializes a test environment and creates API server and scheduler with default // configuration but with pod preemption disabled. func initTestDisablePreemption(t *testing.T, nsPrefix string) *testutils.TestContext { - cfg := configtesting.V1beta2ToInternalWithDefaults(t, v1beta2.KubeSchedulerConfiguration{ - Profiles: []v1beta2.KubeSchedulerProfile{{ + cfg := configtesting.V1beta3ToInternalWithDefaults(t, v1beta3.KubeSchedulerConfiguration{ + Profiles: []v1beta3.KubeSchedulerProfile{{ SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), - Plugins: &v1beta2.Plugins{ - PostFilter: v1beta2.PluginSet{ - Disabled: []v1beta2.Plugin{ + Plugins: &v1beta3.Plugins{ + PostFilter: v1beta3.PluginSet{ + Disabled: []v1beta3.Plugin{ {Name: defaultpreemption.Name}, }, },