Skip to content

Commit b363f19

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#130493 from shajmakh/replace-dep-pointer
test: sched: replace `pointer` use with `ptr`
2 parents c7d8f73 + 8a1057a commit b363f19

File tree

7 files changed

+32
-33
lines changed

7 files changed

+32
-33
lines changed

‎test/integration/scheduler/filters/filters_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
testutils "k8s.io/kubernetes/test/integration/util"
3939
imageutils "k8s.io/kubernetes/test/utils/image"
4040
"k8s.io/kubernetes/test/utils/ktesting"
41-
"k8s.io/utils/pointer"
41+
"k8s.io/utils/ptr"
4242
)
4343

4444
var (
@@ -1472,7 +1472,7 @@ func TestPodTopologySpreadFilter(t *testing.T) {
14721472
"node",
14731473
hardSpread,
14741474
st.MakeLabelSelector().Exists("foo").Obj(),
1475-
pointer.Int32(4), // larger than the number of domains (= 3)
1475+
ptr.To[int32](4), // larger than the number of domains (= 3)
14761476
nil,
14771477
nil,
14781478
nil,
@@ -1498,7 +1498,7 @@ func TestPodTopologySpreadFilter(t *testing.T) {
14981498
"node",
14991499
hardSpread,
15001500
st.MakeLabelSelector().Exists("foo").Obj(),
1501-
pointer.Int32(2), // smaller than the number of domains (= 3)
1501+
ptr.To[int32](2), // smaller than the number of domains (= 3)
15021502
nil,
15031503
nil,
15041504
nil,
@@ -1523,7 +1523,7 @@ func TestPodTopologySpreadFilter(t *testing.T) {
15231523
"zone",
15241524
v1.DoNotSchedule,
15251525
st.MakeLabelSelector().Exists("foo").Obj(),
1526-
pointer.Int32(3), // larger than the number of domains(2)
1526+
ptr.To[int32](3), // larger than the number of domains(2)
15271527
nil,
15281528
nil,
15291529
nil,
@@ -1545,7 +1545,7 @@ func TestPodTopologySpreadFilter(t *testing.T) {
15451545
"zone",
15461546
v1.DoNotSchedule,
15471547
st.MakeLabelSelector().Exists("foo").Obj(),
1548-
pointer.Int32(1), // smaller than the number of domains(2)
1548+
ptr.To[int32](1), // smaller than the number of domains(2)
15491549
nil,
15501550
nil,
15511551
nil,

‎test/integration/scheduler/plugins/plugins_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import (
5555
schedulerutils "k8s.io/kubernetes/test/integration/scheduler"
5656
testutils "k8s.io/kubernetes/test/integration/util"
5757
imageutils "k8s.io/kubernetes/test/utils/image"
58-
"k8s.io/utils/pointer"
58+
"k8s.io/utils/ptr"
5959
)
6060

6161
// imported from testutils
@@ -919,7 +919,7 @@ func TestPostFilterPlugin(t *testing.T) {
919919
// Setup plugins for testing.
920920
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
921921
Profiles: []configv1.KubeSchedulerProfile{{
922-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
922+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
923923
Plugins: &configv1.Plugins{
924924
Filter: configv1.PluginSet{
925925
Enabled: []configv1.Plugin{
@@ -1208,7 +1208,7 @@ func TestPrebindPlugin(t *testing.T) {
12081208
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
12091209
Profiles: []configv1.KubeSchedulerProfile{
12101210
{
1211-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
1211+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
12121212
Plugins: &configv1.Plugins{
12131213
PreBind: configv1.PluginSet{
12141214
Enabled: []configv1.Plugin{
@@ -1218,7 +1218,7 @@ func TestPrebindPlugin(t *testing.T) {
12181218
},
12191219
},
12201220
{
1221-
SchedulerName: pointer.String("2nd-scheduler"),
1221+
SchedulerName: ptr.To("2nd-scheduler"),
12221222
Plugins: &configv1.Plugins{
12231223
Filter: configv1.PluginSet{
12241224
Enabled: []configv1.Plugin{
@@ -1748,7 +1748,7 @@ func TestBindPlugin(t *testing.T) {
17481748
// Setup initial unreserve and bind plugins for testing.
17491749
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
17501750
Profiles: []configv1.KubeSchedulerProfile{{
1751-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
1751+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
17521752
Plugins: &configv1.Plugins{
17531753
MultiPoint: configv1.PluginSet{
17541754
Disabled: []configv1.Plugin{
@@ -2461,7 +2461,7 @@ func TestPreemptWithPermitPlugin(t *testing.T) {
24612461
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
24622462
Profiles: []configv1.KubeSchedulerProfile{
24632463
{
2464-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
2464+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
24652465
Plugins: &configv1.Plugins{
24662466
Permit: configv1.PluginSet{
24672467
Enabled: []configv1.Plugin{
@@ -2647,7 +2647,7 @@ func TestActivatePods(t *testing.T) {
26472647
// Setup initial filter plugin for testing.
26482648
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
26492649
Profiles: []configv1.KubeSchedulerProfile{{
2650-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
2650+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
26512651
Plugins: &configv1.Plugins{
26522652
PreFilter: configv1.PluginSet{
26532653
Enabled: []configv1.Plugin{
@@ -2823,7 +2823,7 @@ func TestPreEnqueuePluginEventsToRegister(t *testing.T) {
28232823
// Setup plugins for testing.
28242824
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
28252825
Profiles: []configv1.KubeSchedulerProfile{{
2826-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
2826+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
28272827
Plugins: &configv1.Plugins{
28282828
PreEnqueue: configv1.PluginSet{
28292829
Enabled: []configv1.Plugin{

‎test/integration/scheduler/preemption/preemption_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import (
5959
"k8s.io/kubernetes/plugin/pkg/admission/priority"
6060
testutils "k8s.io/kubernetes/test/integration/util"
6161
"k8s.io/kubernetes/test/utils/ktesting"
62-
"k8s.io/utils/pointer"
6362
"k8s.io/utils/ptr"
6463
)
6564

@@ -175,7 +174,7 @@ func TestPreemption(t *testing.T) {
175174
}
176175
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
177176
Profiles: []configv1.KubeSchedulerProfile{{
178-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
177+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
179178
Plugins: &configv1.Plugins{
180179
Filter: configv1.PluginSet{
181180
Enabled: []configv1.Plugin{
@@ -874,7 +873,7 @@ func TestAsyncPreemption(t *testing.T) {
874873
}
875874
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
876875
Profiles: []configv1.KubeSchedulerProfile{{
877-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
876+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
878877
Plugins: &configv1.Plugins{
879878
MultiPoint: configv1.PluginSet{
880879
Enabled: []configv1.Plugin{
@@ -1654,7 +1653,7 @@ func TestNominatedNodeCleanUp(t *testing.T) {
16541653
t.Run(fmt.Sprintf("%s (Async preemption enabled: %v)", tt.name, asyncPreemptionEnabled), func(t *testing.T) {
16551654
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
16561655
Profiles: []configv1.KubeSchedulerProfile{{
1657-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
1656+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
16581657
Plugins: tt.customPlugins,
16591658
}},
16601659
})
@@ -2146,7 +2145,7 @@ func TestPreferNominatedNode(t *testing.T) {
21462145
func TestReadWriteOncePodPreemption(t *testing.T) {
21472146
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
21482147
Profiles: []configv1.KubeSchedulerProfile{{
2149-
SchedulerName: pointer.StringPtr(v1.DefaultSchedulerName),
2148+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
21502149
Plugins: &configv1.Plugins{
21512150
Filter: configv1.PluginSet{
21522151
Enabled: []configv1.Plugin{

‎test/integration/scheduler/queueing/queue_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import (
5151
testfwk "k8s.io/kubernetes/test/integration/framework"
5252
testutils "k8s.io/kubernetes/test/integration/util"
5353
imageutils "k8s.io/kubernetes/test/utils/image"
54-
"k8s.io/utils/pointer"
54+
"k8s.io/utils/ptr"
5555
)
5656

5757
func TestSchedulingGates(t *testing.T) {
@@ -264,7 +264,7 @@ func TestCustomResourceEnqueue(t *testing.T) {
264264
}
265265
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
266266
Profiles: []configv1.KubeSchedulerProfile{{
267-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
267+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
268268
Plugins: &configv1.Plugins{
269269
Filter: configv1.PluginSet{
270270
Enabled: []configv1.Plugin{
@@ -378,7 +378,7 @@ func TestRequeueByBindFailure(t *testing.T) {
378378

379379
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
380380
Profiles: []configv1.KubeSchedulerProfile{{
381-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
381+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
382382
Plugins: &configv1.Plugins{
383383
MultiPoint: configv1.PluginSet{
384384
Enabled: []configv1.Plugin{
@@ -471,7 +471,7 @@ func TestRequeueByPermitRejection(t *testing.T) {
471471
}
472472
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
473473
Profiles: []configv1.KubeSchedulerProfile{{
474-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
474+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
475475
Plugins: &configv1.Plugins{
476476
MultiPoint: configv1.PluginSet{
477477
Enabled: []configv1.Plugin{

‎test/integration/scheduler/scheduler_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing"
4141
st "k8s.io/kubernetes/pkg/scheduler/testing"
4242
testutils "k8s.io/kubernetes/test/integration/util"
43-
"k8s.io/utils/pointer"
43+
"k8s.io/utils/ptr"
4444
)
4545

4646
type nodeMutationFunc func(t *testing.T, n *v1.Node, nodeLister corelisters.NodeLister, c clientset.Interface)
@@ -248,13 +248,13 @@ func TestMultipleSchedulers(t *testing.T) {
248248
// 5. create and start a scheduler with name "foo-scheduler"
249249
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
250250
Profiles: []configv1.KubeSchedulerProfile{{
251-
SchedulerName: pointer.String(fooScheduler),
251+
SchedulerName: ptr.To(fooScheduler),
252252
PluginConfig: []configv1.PluginConfig{
253253
{
254254
Name: "VolumeBinding",
255255
Args: runtime.RawExtension{
256256
Object: &configv1.VolumeBindingArgs{
257-
BindTimeoutSeconds: pointer.Int64(30),
257+
BindTimeoutSeconds: ptr.To[int64](30),
258258
},
259259
},
260260
},
@@ -278,8 +278,8 @@ func TestMultipleSchedulers(t *testing.T) {
278278
func TestMultipleSchedulingProfiles(t *testing.T) {
279279
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
280280
Profiles: []configv1.KubeSchedulerProfile{
281-
{SchedulerName: pointer.String("default-scheduler")},
282-
{SchedulerName: pointer.String("custom-scheduler")},
281+
{SchedulerName: ptr.To("default-scheduler")},
282+
{SchedulerName: ptr.To("custom-scheduler")},
283283
},
284284
})
285285

‎test/integration/scheduler/scoring/priorities_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
st "k8s.io/kubernetes/pkg/scheduler/testing"
4545
testutils "k8s.io/kubernetes/test/integration/util"
4646
imageutils "k8s.io/kubernetes/test/utils/image"
47-
"k8s.io/utils/pointer"
47+
"k8s.io/utils/ptr"
4848
)
4949

5050
// imported from testutils
@@ -80,7 +80,7 @@ const (
8080
func initTestSchedulerForScoringTests(t *testing.T, preScorePluginName, scorePluginName string) *testutils.TestContext {
8181
cc := configv1.KubeSchedulerConfiguration{
8282
Profiles: []configv1.KubeSchedulerProfile{{
83-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
83+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
8484
Plugins: &configv1.Plugins{
8585
PreScore: configv1.PluginSet{
8686
Disabled: []configv1.Plugin{
@@ -89,7 +89,7 @@ func initTestSchedulerForScoringTests(t *testing.T, preScorePluginName, scorePlu
8989
},
9090
Score: configv1.PluginSet{
9191
Enabled: []configv1.Plugin{
92-
{Name: scorePluginName, Weight: pointer.Int32(1)},
92+
{Name: scorePluginName, Weight: ptr.To[int32](1)},
9393
},
9494
Disabled: []configv1.Plugin{
9595
{Name: "*"},
@@ -117,7 +117,7 @@ func initTestSchedulerForNodeResourcesTest(t *testing.T, strategy configv1.Scori
117117
cfg := configtesting.V1ToInternalWithDefaults(t, configv1.KubeSchedulerConfiguration{
118118
Profiles: []configv1.KubeSchedulerProfile{
119119
{
120-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
120+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
121121
PluginConfig: []configv1.PluginConfig{
122122
{
123123
Name: noderesources.Name,

‎test/integration/scheduler/util.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
3636
st "k8s.io/kubernetes/pkg/scheduler/testing"
3737
testutils "k8s.io/kubernetes/test/integration/util"
38-
"k8s.io/utils/pointer"
38+
"k8s.io/utils/ptr"
3939
)
4040

4141
// The returned shutdown func will delete created resources and scheduler, resources should be those
@@ -140,7 +140,7 @@ func InitRegistryAndConfig(t *testing.T, factory func(plugin framework.Plugin) f
140140

141141
versionedCfg := configv1.KubeSchedulerConfiguration{
142142
Profiles: []configv1.KubeSchedulerProfile{{
143-
SchedulerName: pointer.String(v1.DefaultSchedulerName),
143+
SchedulerName: ptr.To(v1.DefaultSchedulerName),
144144
Plugins: pls,
145145
}},
146146
}

0 commit comments

Comments
 (0)