From 666605498a384834c52cf1f1b39fd61fc3468670 Mon Sep 17 00:00:00 2001 From: Kante Yin Date: Mon, 26 Dec 2022 22:06:44 +0800 Subject: [PATCH] Replace deprecated pointer function Signed-off-by: Kante Yin --- test/integration/scheduler/plugins/plugins_test.go | 14 +++++++------- .../scheduler/preemption/preemption_test.go | 4 ++-- test/integration/scheduler/queue_test.go | 2 +- test/integration/scheduler/scheduler_test.go | 8 ++++---- .../scheduler/scoring/priorities_test.go | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/integration/scheduler/plugins/plugins_test.go b/test/integration/scheduler/plugins/plugins_test.go index 8760a47817f..12a73a40d13 100644 --- a/test/integration/scheduler/plugins/plugins_test.go +++ b/test/integration/scheduler/plugins/plugins_test.go @@ -703,7 +703,7 @@ func TestPostFilterPlugin(t *testing.T) { // Setup plugins for testing. cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ Filter: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -949,7 +949,7 @@ func TestPrebindPlugin(t *testing.T) { cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{ { - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ PreBind: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -959,7 +959,7 @@ func TestPrebindPlugin(t *testing.T) { }, }, { - SchedulerName: pointer.StringPtr("2nd-scheduler"), + SchedulerName: pointer.String("2nd-scheduler"), Plugins: &configv1.Plugins{ Filter: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -1491,7 +1491,7 @@ func TestBindPlugin(t *testing.T) { // Setup initial unreserve and bind plugins for testing. cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ MultiPoint: configv1.PluginSet{ Disabled: []configv1.Plugin{ @@ -2200,7 +2200,7 @@ func TestPreemptWithPermitPlugin(t *testing.T) { cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{ { - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ Permit: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -2448,7 +2448,7 @@ func TestActivatePods(t *testing.T) { // Setup initial filter plugin for testing. cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ PreFilter: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -2567,7 +2567,7 @@ func initRegistryAndConfig(t *testing.T, plugins ...framework.Plugin) (framework versionedCfg := configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: pls, }}, } diff --git a/test/integration/scheduler/preemption/preemption_test.go b/test/integration/scheduler/preemption/preemption_test.go index 6adedbb2779..f33180cae2f 100644 --- a/test/integration/scheduler/preemption/preemption_test.go +++ b/test/integration/scheduler/preemption/preemption_test.go @@ -155,7 +155,7 @@ func TestPreemption(t *testing.T) { } cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ Filter: configv1.PluginSet{ Enabled: []configv1.Plugin{ @@ -1124,7 +1124,7 @@ func TestNominatedNodeCleanUp(t *testing.T) { t.Run(tt.name, func(t *testing.T) { cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: tt.customPlugins, }}, }) diff --git a/test/integration/scheduler/queue_test.go b/test/integration/scheduler/queue_test.go index 42b36f048a4..05a788d20df 100644 --- a/test/integration/scheduler/queue_test.go +++ b/test/integration/scheduler/queue_test.go @@ -341,7 +341,7 @@ func TestCustomResourceEnqueue(t *testing.T) { } cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ Filter: configv1.PluginSet{ Enabled: []configv1.Plugin{ diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index fd921c72471..2443857671d 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -249,13 +249,13 @@ func TestMultipleSchedulers(t *testing.T) { // 5. create and start a scheduler with name "foo-scheduler" cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(fooScheduler), + SchedulerName: pointer.String(fooScheduler), PluginConfig: []configv1.PluginConfig{ { Name: "VolumeBinding", Args: runtime.RawExtension{ Object: &configv1.VolumeBindingArgs{ - BindTimeoutSeconds: pointer.Int64Ptr(30), + BindTimeoutSeconds: pointer.Int64(30), }, }, }, @@ -279,8 +279,8 @@ func TestMultipleSchedulers(t *testing.T) { func TestMultipleSchedulingProfiles(t *testing.T) { cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{ - {SchedulerName: pointer.StringPtr("default-scheduler")}, - {SchedulerName: pointer.StringPtr("custom-scheduler")}, + {SchedulerName: pointer.String("default-scheduler")}, + {SchedulerName: pointer.String("custom-scheduler")}, }, }) diff --git a/test/integration/scheduler/scoring/priorities_test.go b/test/integration/scheduler/scoring/priorities_test.go index 8237ccf9e5b..52e52ebbfb2 100644 --- a/test/integration/scheduler/scoring/priorities_test.go +++ b/test/integration/scheduler/scoring/priorities_test.go @@ -76,11 +76,11 @@ const ( func initTestSchedulerForPriorityTest(t *testing.T, scorePluginName string) *testutils.TestContext { cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{{ - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), Plugins: &configv1.Plugins{ Score: configv1.PluginSet{ Enabled: []configv1.Plugin{ - {Name: scorePluginName, Weight: pointer.Int32Ptr(1)}, + {Name: scorePluginName, Weight: pointer.Int32(1)}, }, Disabled: []configv1.Plugin{ {Name: "*"}, @@ -104,10 +104,10 @@ func initTestSchedulerForNodeResourcesTest(t *testing.T) *testutils.TestContext cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{ Profiles: []configv1.KubeSchedulerProfile{ { - SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName), + SchedulerName: pointer.String(v1.DefaultSchedulerName), }, { - SchedulerName: pointer.StringPtr("gpu-binpacking-scheduler"), + SchedulerName: pointer.String("gpu-binpacking-scheduler"), PluginConfig: []configv1.PluginConfig{ { Name: noderesources.Name,