From 9236425df6b825fb45d063dbc07b3eeb1d04258d Mon Sep 17 00:00:00 2001 From: Lan Liang Date: Mon, 15 Apr 2024 14:32:01 +0000 Subject: [PATCH] pkg/registry: drop pointer wrapper functions. The new k8s.io/utils/ptr package provides generic wrapper functions, which can be used instead of type-specific pointer wrapper functions. This replaces the latter with the former, and migrates other uses of the deprecated pointer package to ptr in affacted files. See kubernetes/utils#283 for details. Signed-off-by: Lan Liang --- pkg/registry/batch/cronjob/strategy_test.go | 10 +- .../batch/job/storage/storage_test.go | 5 +- pkg/registry/batch/job/strategy_test.go | 273 +++++++++--------- .../certificates/storage/metrics_test.go | 4 +- .../certificates/strategy_test.go | 6 +- pkg/registry/core/service/strategy_test.go | 4 +- .../prioritylevelconfiguration_test.go | 17 +- 7 files changed, 159 insertions(+), 160 deletions(-) diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index f9b0098eaae..677ce014fb2 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/apis/batch" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) var ( @@ -38,20 +38,20 @@ var ( validCronjobSpec = batch.CronJobSpec{ Schedule: "5 5 * * ?", ConcurrencyPolicy: batch.AllowConcurrent, - TimeZone: pointer.String("Asia/Shanghai"), + TimeZone: ptr.To("Asia/Shanghai"), JobTemplate: batch.JobTemplateSpec{ Spec: batch.JobSpec{ Template: validPodTemplateSpec, CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(10), - Parallelism: pointer.Int32(10), + Completions: ptr.To[int32](10), + Parallelism: ptr.To[int32](10), }, }, } cronjobSpecWithTZinSchedule = batch.CronJobSpec{ Schedule: "CRON_TZ=UTC 5 5 * * ?", ConcurrencyPolicy: batch.AllowConcurrent, - TimeZone: pointer.String("Asia/DoesNotExist"), + TimeZone: ptr.To("Asia/DoesNotExist"), JobTemplate: batch.JobTemplateSpec{ Spec: batch.JobSpec{ Template: validPodTemplateSpec, diff --git a/pkg/registry/batch/job/storage/storage_test.go b/pkg/registry/batch/job/storage/storage_test.go index 9894b57a3b3..42093735421 100644 --- a/pkg/registry/batch/job/storage/storage_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -17,9 +17,10 @@ limitations under the License. package storage import ( - "k8s.io/utils/pointer" "testing" + "k8s.io/utils/ptr" + batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/internalversion" @@ -138,7 +139,7 @@ func TestCreate(t *testing.T) { // invalid (empty selector) &batch.Job{ Spec: batch.JobSpec{ - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Completions: validJob.Spec.Completions, Selector: &metav1.LabelSelector{}, Template: validJob.Spec.Template, diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index 44db91a8721..24e7c5a7b1f 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -35,7 +35,6 @@ import ( _ "k8s.io/kubernetes/pkg/apis/batch/install" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" - "k8s.io/utils/pointer" "k8s.io/utils/ptr" ) @@ -51,7 +50,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { { Action: batch.PodFailurePolicyActionFailJob, OnExitCodes: &batch.PodFailurePolicyOnExitCodesRequirement{ - ContainerName: pointer.String("container-name"), + ContainerName: ptr.To("container-name"), Operator: batch.PodFailurePolicyOnExitCodesOpIn, Values: []int32{1}, }, @@ -63,7 +62,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { { Action: batch.PodFailurePolicyActionIgnore, OnExitCodes: &batch.PodFailurePolicyOnExitCodesRequirement{ - ContainerName: pointer.String("updated-container-name"), + ContainerName: ptr.To("updated-container-name"), Operator: batch.PodFailurePolicyOnExitCodesOpIn, Values: []int32{2}, }, @@ -220,8 +219,8 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, wantJob: batch.Job{ @@ -229,8 +228,8 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, }, @@ -250,8 +249,8 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, wantJob: batch.Job{ @@ -520,7 +519,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Suspend: pointer.Bool(false), + Suspend: ptr.To(false), }, }, updatedJob: batch.Job{ @@ -528,7 +527,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Suspend: pointer.Bool(true), + Suspend: ptr.To(true), }, }, wantJob: batch.Job{ @@ -536,7 +535,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Suspend: pointer.Bool(true), + Suspend: ptr.To(true), }, }, }, @@ -553,7 +552,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Suspend: pointer.Bool(true), + Suspend: ptr.To(true), }, }, wantJob: batch.Job{ @@ -561,7 +560,7 @@ func TestJobStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Suspend: pointer.Bool(true), + Suspend: ptr.To(true), }, }, }, @@ -596,7 +595,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { { Action: batch.PodFailurePolicyActionFailJob, OnExitCodes: &batch.PodFailurePolicyOnExitCodesRequirement{ - ContainerName: pointer.String("container-name"), + ContainerName: ptr.To("container-name"), Operator: batch.PodFailurePolicyOnExitCodesOpIn, Values: []int32{1}, }, @@ -626,7 +625,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, }, }, @@ -634,7 +633,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, }, }, @@ -687,20 +686,20 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, wantJob: batch.Job{ ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, }, @@ -710,17 +709,17 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), - MaxFailedIndexes: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), + MaxFailedIndexes: ptr.To[int32](1), }, }, wantJob: batch.Job{ ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, BackoffLimitPerIndex: nil, MaxFailedIndexes: nil, @@ -733,7 +732,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, PodFailurePolicy: podFailurePolicy, }, @@ -742,7 +741,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodFailurePolicy: podFailurePolicy, }, @@ -754,7 +753,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, PodReplacementPolicy: podReplacementPolicy(batch.Failed), }, @@ -763,7 +762,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodReplacementPolicy: podReplacementPolicy(batch.Failed), }, @@ -775,7 +774,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, PodReplacementPolicy: podReplacementPolicy(batch.Failed), }, @@ -784,7 +783,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodReplacementPolicy: nil, }, @@ -796,7 +795,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, PodFailurePolicy: podFailurePolicy, }, @@ -805,7 +804,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodFailurePolicy: nil, }, @@ -816,7 +815,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, }, Status: batch.JobStatus{ @@ -827,7 +826,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, }, }, @@ -839,9 +838,9 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), PodFailurePolicy: &batch.PodFailurePolicy{ Rules: []batch.PodFailurePolicyRule{ { @@ -859,7 +858,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodFailurePolicy: &batch.PodFailurePolicy{ Rules: []batch.PodFailurePolicyRule{}, @@ -874,9 +873,9 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), PodFailurePolicy: &batch.PodFailurePolicy{ Rules: []batch.PodFailurePolicyRule{ { @@ -908,7 +907,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, PodFailurePolicy: &batch.PodFailurePolicy{ Rules: []batch.PodFailurePolicyRule{ @@ -937,7 +936,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, ManagedBy: ptr.To("custom-controller-name"), }, @@ -946,7 +945,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, }, }, @@ -957,7 +956,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(0), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: validPodTemplateSpec, ManagedBy: ptr.To("custom-controller-name"), }, @@ -966,7 +965,7 @@ func TestJobStrategy_PrepareForCreate(t *testing.T) { ObjectMeta: getValidObjectMeta(1), Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: expectedPodTemplateSpec, ManagedBy: ptr.To("custom-controller-name"), }, @@ -1047,12 +1046,12 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, update: func(job *batch.Job) { - job.Spec.Parallelism = pointer.Int32Ptr(2) + job.Spec.Parallelism = ptr.To[int32](2) }, }, "update completions disallowed": { @@ -1065,13 +1064,13 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), - Completions: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), + Completions: ptr.To[int32](1), }, }, update: func(job *batch.Job) { - job.Spec.Completions = pointer.Int32Ptr(2) + job.Spec.Completions = ptr.To[int32](2) }, wantErrs: field.ErrorList{ {Type: field.ErrorTypeInvalid, Field: "spec.completions"}, @@ -1090,8 +1089,8 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, update: func(job *batch.Job) { @@ -1112,8 +1111,8 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, update: func(job *batch.Job) { @@ -1131,8 +1130,8 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, update: func(job *batch.Job) { @@ -1153,9 +1152,9 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), - Suspend: pointer.BoolPtr(true), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), + Suspend: ptr.To(true), }, Status: batch.JobStatus{ StartTime: &now, @@ -1179,9 +1178,9 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), - Suspend: pointer.BoolPtr(true), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), + Suspend: ptr.To(true), }, }, update: func(job *batch.Job) { @@ -1201,7 +1200,7 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { MatchLabels: map[string]string{"a": "b"}, MatchExpressions: []metav1.LabelSelectorRequirement{{Key: "key", Operator: metav1.LabelSelectorOpNotIn, Values: []string{"bad value"}}}, }, - ManualSelector: pointer.BoolPtr(true), + ManualSelector: ptr.To(true), Template: validPodTemplateSpec, }, }, @@ -1222,7 +1221,7 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{batch.LegacyControllerUidLabel: "test"}, }, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{batch.LegacyJobNameLabel: "myjob", batch.LegacyControllerUidLabel: "test"}, @@ -1252,7 +1251,7 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{batch.ControllerUidLabel: "test"}, }, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{batch.LegacyJobNameLabel: "myjob", batch.JobNameLabel: "myjob", batch.LegacyControllerUidLabel: "test", batch.ControllerUidLabel: "test"}, @@ -1281,10 +1280,10 @@ func TestJobStrategy_ValidateUpdate(t *testing.T) { }, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(2), - BackoffLimitPerIndex: pointer.Int32(1), + Completions: ptr.To[int32](2), + BackoffLimitPerIndex: ptr.To[int32](1), Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: validPodTemplateSpecNever, PodFailurePolicy: &batch.PodFailurePolicy{ Rules: []batch.PodFailurePolicyRule{ @@ -1349,8 +1348,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, @@ -1364,8 +1363,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, }, @@ -1380,8 +1379,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, @@ -1395,8 +1394,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, }, @@ -1413,8 +1412,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Template: api.PodTemplateSpec{ Spec: api.PodSpec{ImagePullSecrets: []api.LocalObjectReference{{Name: ""}}}, }, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, @@ -1428,8 +1427,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, wantWarningsCount: 1, @@ -1445,8 +1444,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { }, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(100_001), - Parallelism: pointer.Int32(10_001), + Completions: ptr.To[int32](100_001), + Parallelism: ptr.To[int32](10_001), Template: validPodTemplateSpec, }, }, @@ -1459,8 +1458,8 @@ func TestJobStrategy_WarningsOnUpdate(t *testing.T) { }, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(100_001), - Parallelism: pointer.Int32(10_000), + Completions: ptr.To[int32](100_001), + Parallelism: ptr.To[int32](10_000), Template: validPodTemplateSpec, }, }, @@ -1533,8 +1532,8 @@ func TestJobStrategy_WarningsOnCreate(t *testing.T) { }, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Parallelism: pointer.Int32(100_001), - Completions: pointer.Int32(100_001), + Parallelism: ptr.To[int32](100_001), + Completions: ptr.To[int32](100_001), Template: validPodTemplate, }, }, @@ -1577,7 +1576,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: batchLabels, @@ -1589,7 +1588,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: batchLabels, @@ -1603,7 +1602,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, @@ -1615,7 +1614,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, @@ -1629,7 +1628,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{}, @@ -1641,7 +1640,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{}, @@ -1681,8 +1680,8 @@ func TestJobStrategy_Validate(t *testing.T) { }, Spec: validPodSpec, }, - Completions: pointer.Int32Ptr(2), - ManualSelector: pointer.BoolPtr(true), + Completions: ptr.To[int32](2), + ManualSelector: ptr.To(true), }, }, wantJob: &batch.Job{ @@ -1695,8 +1694,8 @@ func TestJobStrategy_Validate(t *testing.T) { }, Spec: validPodSpec, }, - Completions: pointer.Int32Ptr(2), - ManualSelector: pointer.BoolPtr(true), + Completions: ptr.To[int32](2), + ManualSelector: ptr.To(true), }, }, }, @@ -1705,16 +1704,16 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, }, Spec: validPodSpec, }, - Completions: pointer.Int32Ptr(2), - Suspend: pointer.BoolPtr(true), - TTLSecondsAfterFinished: pointer.Int32Ptr(0), + Completions: ptr.To[int32](2), + Suspend: ptr.To(true), + TTLSecondsAfterFinished: ptr.To[int32](0), CompletionMode: completionModePtr(batch.IndexedCompletion), }, }, @@ -1722,16 +1721,16 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, }, Spec: validPodSpec, }, - Completions: pointer.Int32Ptr(2), - Suspend: pointer.BoolPtr(true), - TTLSecondsAfterFinished: pointer.Int32Ptr(0), + Completions: ptr.To[int32](2), + Suspend: ptr.To(true), + TTLSecondsAfterFinished: ptr.To[int32](0), CompletionMode: completionModePtr(batch.IndexedCompletion), }, }, @@ -1741,7 +1740,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, @@ -1759,7 +1758,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: defaultSelector, - ManualSelector: pointer.Bool(false), + ManualSelector: ptr.To(false), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: labelsWithNonBatch, @@ -1782,7 +1781,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -1806,7 +1805,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -1835,7 +1834,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -1859,7 +1858,7 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -1888,10 +1887,10 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(2), - BackoffLimitPerIndex: pointer.Int32(1), + Completions: ptr.To[int32](2), + BackoffLimitPerIndex: ptr.To[int32](1), Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -1915,10 +1914,10 @@ func TestJobStrategy_Validate(t *testing.T) { ObjectMeta: validObjectMeta, Spec: batch.JobSpec{ CompletionMode: completionModePtr(batch.IndexedCompletion), - Completions: pointer.Int32(2), - BackoffLimitPerIndex: pointer.Int32(1), + Completions: ptr.To[int32](2), + BackoffLimitPerIndex: ptr.To[int32](1), Selector: validSelector, - ManualSelector: pointer.Bool(true), + ManualSelector: ptr.To(true), Template: api.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: validSelector.MatchLabels, @@ -2001,7 +2000,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, Status: batch.JobStatus{ Active: 11, @@ -2012,7 +2011,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, Status: batch.JobStatus{ Active: 12, @@ -2023,7 +2022,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, Status: batch.JobStatus{ Active: 12, @@ -2036,7 +2035,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(3), + Parallelism: ptr.To[int32](3), }, }, newJob: &batch.Job{ @@ -2044,7 +2043,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, }, wantJob: &batch.Job{ @@ -2052,7 +2051,7 @@ func TestStatusStrategy_PrepareForUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(3), + Parallelism: ptr.To[int32](3), }, }, }, @@ -2114,7 +2113,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, }, newJob: &batch.Job{ @@ -2126,7 +2125,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, }, wantJob: &batch.Job{ @@ -2138,7 +2137,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - Parallelism: pointer.Int32(4), + Parallelism: ptr.To[int32](4), }, }, }, @@ -2882,7 +2881,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Completions: ptr.To[int32](5), CompletionMode: completionModePtr(batch.IndexedCompletion), - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), }, }, newJob: &batch.Job{ @@ -2890,7 +2889,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Completions: ptr.To[int32](5), CompletionMode: completionModePtr(batch.IndexedCompletion), - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), }, Status: batch.JobStatus{ FailedIndexes: ptr.To("invalid format"), @@ -2907,7 +2906,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Completions: ptr.To[int32](5), CompletionMode: completionModePtr(batch.IndexedCompletion), - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), }, Status: batch.JobStatus{ FailedIndexes: ptr.To("invalid format"), @@ -2918,7 +2917,7 @@ func TestStatusStrategy_ValidateUpdate(t *testing.T) { Spec: batch.JobSpec{ Completions: ptr.To[int32](5), CompletionMode: completionModePtr(batch.IndexedCompletion), - BackoffLimitPerIndex: pointer.Int32(1), + BackoffLimitPerIndex: ptr.To[int32](1), }, Status: batch.JobStatus{ FailedIndexes: ptr.To("invalid format"), @@ -3460,8 +3459,8 @@ func TestJobStrategy_GetAttrs(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, }, @@ -3476,8 +3475,8 @@ func TestJobStrategy_GetAttrs(t *testing.T) { Spec: batch.JobSpec{ Selector: validSelector, Template: validPodTemplateSpec, - ManualSelector: pointer.BoolPtr(true), - Parallelism: pointer.Int32Ptr(1), + ManualSelector: ptr.To(true), + Parallelism: ptr.To[int32](1), }, }, }, diff --git a/pkg/registry/certificates/certificates/storage/metrics_test.go b/pkg/registry/certificates/certificates/storage/metrics_test.go index 3841b01b59f..97927af115b 100644 --- a/pkg/registry/certificates/certificates/storage/metrics_test.go +++ b/pkg/registry/certificates/certificates/storage/metrics_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/util/certificate/csr" "k8s.io/component-base/metrics" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func Test_countCSRDurationMetric(t *testing.T) { @@ -66,7 +66,7 @@ func Test_countCSRDurationMetric(t *testing.T) { old: &certificates.CertificateSigningRequest{ Spec: certificates.CertificateSigningRequestSpec{ SignerName: "fancy", - ExpirationSeconds: pointer.Int32(77), + ExpirationSeconds: ptr.To[int32](77), }, }, options: &metav1.UpdateOptions{}, diff --git a/pkg/registry/certificates/certificates/strategy_test.go b/pkg/registry/certificates/certificates/strategy_test.go index 746427eb7bd..63065b210c5 100644 --- a/pkg/registry/certificates/certificates/strategy_test.go +++ b/pkg/registry/certificates/certificates/strategy_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" certapi "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func TestStrategyCreate(t *testing.T) { @@ -119,12 +119,12 @@ func TestStrategyCreate(t *testing.T) { ctx: genericapirequest.NewContext(), obj: &certapi.CertificateSigningRequest{ Spec: certapi.CertificateSigningRequestSpec{ - ExpirationSeconds: pointer.Int32(1234), + ExpirationSeconds: ptr.To[int32](1234), }, }, expectedObj: &certapi.CertificateSigningRequest{ Spec: certapi.CertificateSigningRequestSpec{ - ExpirationSeconds: pointer.Int32(1234), + ExpirationSeconds: ptr.To[int32](1234), }, Status: certapi.CertificateSigningRequestStatus{Conditions: []certapi.CertificateSigningRequestCondition{}}, }, diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index 110a0385307..f82a47a9c83 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -563,10 +563,10 @@ func TestDropTypeDependentFields(t *testing.T) { } } setAllocateLoadBalancerNodePortsTrue := func(svc *api.Service) { - svc.Spec.AllocateLoadBalancerNodePorts = ptr.To[bool](true) + svc.Spec.AllocateLoadBalancerNodePorts = ptr.To(true) } setAllocateLoadBalancerNodePortsFalse := func(svc *api.Service) { - svc.Spec.AllocateLoadBalancerNodePorts = ptr.To[bool](false) + svc.Spec.AllocateLoadBalancerNodePorts = ptr.To(false) } clearAllocateLoadBalancerNodePorts := func(svc *api.Service) { svc.Spec.AllocateLoadBalancerNodePorts = nil diff --git a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go index d906feae24f..6aef244a849 100644 --- a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go +++ b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go @@ -29,7 +29,6 @@ import ( flowcontrollisters "k8s.io/client-go/listers/flowcontrol/v1" toolscache "k8s.io/client-go/tools/cache" flowcontrolapisv1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1" - "k8s.io/utils/pointer" "k8s.io/utils/ptr" "github.com/google/go-cmp/cmp" @@ -39,8 +38,8 @@ func TestEnsurePriorityLevel(t *testing.T) { validExemptPL := func() *flowcontrolv1.PriorityLevelConfiguration { copy := bootstrap.MandatoryPriorityLevelConfigurationExempt.DeepCopy() copy.Annotations[flowcontrolv1.AutoUpdateAnnotationKey] = "true" - copy.Spec.Exempt.NominalConcurrencyShares = pointer.Int32(10) - copy.Spec.Exempt.LendablePercent = pointer.Int32(50) + copy.Spec.Exempt.NominalConcurrencyShares = ptr.To[int32](10) + copy.Spec.Exempt.LendablePercent = ptr.To[int32](50) return copy }() @@ -275,7 +274,7 @@ func TestPriorityLevelSpecChanged(t *testing.T) { Type: flowcontrolv1.PriorityLevelEnablementLimited, Limited: &flowcontrolv1.LimitedPriorityLevelConfiguration{ NominalConcurrencyShares: ptr.To(flowcontrolapisv1.PriorityLevelConfigurationDefaultNominalConcurrencyShares), - LendablePercent: pointer.Int32(0), + LendablePercent: ptr.To[int32](0), LimitResponse: flowcontrolv1.LimitResponse{ Type: flowcontrolv1.LimitResponseTypeReject, }, @@ -287,8 +286,8 @@ func TestPriorityLevelSpecChanged(t *testing.T) { Spec: flowcontrolv1.PriorityLevelConfigurationSpec{ Type: flowcontrolv1.PriorityLevelEnablementExempt, Exempt: &flowcontrolv1.ExemptPriorityLevelConfiguration{ - NominalConcurrencyShares: pointer.Int32(42), - LendablePercent: pointer.Int32(33), + NominalConcurrencyShares: ptr.To[int32](42), + LendablePercent: ptr.To[int32](33), }, }, } @@ -297,8 +296,8 @@ func TestPriorityLevelSpecChanged(t *testing.T) { Spec: flowcontrolv1.PriorityLevelConfigurationSpec{ Type: flowcontrolv1.PriorityLevelEnablementExempt, Exempt: &flowcontrolv1.ExemptPriorityLevelConfiguration{ - NominalConcurrencyShares: pointer.Int32(24), - LendablePercent: pointer.Int32(86), + NominalConcurrencyShares: ptr.To[int32](24), + LendablePercent: ptr.To[int32](86), }, }, } @@ -488,7 +487,7 @@ func (b *plBuilder) WithLimited(nominalConcurrencyShares int32) *plBuilder { b.object.Spec.Type = flowcontrolv1.PriorityLevelEnablementLimited b.object.Spec.Limited = &flowcontrolv1.LimitedPriorityLevelConfiguration{ NominalConcurrencyShares: ptr.To(nominalConcurrencyShares), - LendablePercent: pointer.Int32(0), + LendablePercent: ptr.To[int32](0), LimitResponse: flowcontrolv1.LimitResponse{ Type: flowcontrolv1.LimitResponseTypeReject, },