diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index 8b22cc29e34..d829ec72901 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/apiserver/pkg/warning" "k8s.io/client-go/tools/cache" featuregatetesting "k8s.io/component-base/featuregate/testing" - utilpointer "k8s.io/utils/pointer" + ptr "k8s.io/utils/ptr" apitesting "k8s.io/kubernetes/pkg/api/testing" api "k8s.io/kubernetes/pkg/apis/core" @@ -418,7 +418,7 @@ func TestCheckGracefulDelete(t *testing.T) { pod: &api.Pod{ Spec: api.PodSpec{ NodeName: "something", - TerminationGracePeriodSeconds: utilpointer.Int64(-1), + TerminationGracePeriodSeconds: ptr.To[int64](-1), }, Status: api.PodStatus{}, }, @@ -429,7 +429,7 @@ func TestCheckGracefulDelete(t *testing.T) { t.Run(tc.name, func(t *testing.T) { out := &metav1.DeleteOptions{} if tc.deleteGracePeriod != nil { - out.GracePeriodSeconds = utilpointer.Int64(*tc.deleteGracePeriod) + out.GracePeriodSeconds = ptr.To[int64](*tc.deleteGracePeriod) } Strategy.CheckGracefulDelete(genericapirequest.NewContext(), tc.pod, out) if out.GracePeriodSeconds == nil { diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index ccb749f2546..110a0385307 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -31,7 +31,6 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/features" - utilpointer "k8s.io/utils/pointer" "k8s.io/utils/ptr" ) @@ -564,22 +563,22 @@ func TestDropTypeDependentFields(t *testing.T) { } } setAllocateLoadBalancerNodePortsTrue := func(svc *api.Service) { - svc.Spec.AllocateLoadBalancerNodePorts = utilpointer.BoolPtr(true) + svc.Spec.AllocateLoadBalancerNodePorts = ptr.To[bool](true) } setAllocateLoadBalancerNodePortsFalse := func(svc *api.Service) { - svc.Spec.AllocateLoadBalancerNodePorts = utilpointer.BoolPtr(false) + svc.Spec.AllocateLoadBalancerNodePorts = ptr.To[bool](false) } clearAllocateLoadBalancerNodePorts := func(svc *api.Service) { svc.Spec.AllocateLoadBalancerNodePorts = nil } setLoadBalancerClass := func(svc *api.Service) { - svc.Spec.LoadBalancerClass = utilpointer.String("test-load-balancer-class") + svc.Spec.LoadBalancerClass = ptr.To("test-load-balancer-class") } clearLoadBalancerClass := func(svc *api.Service) { svc.Spec.LoadBalancerClass = nil } changeLoadBalancerClass := func(svc *api.Service) { - svc.Spec.LoadBalancerClass = utilpointer.String("test-load-balancer-class-changed") + svc.Spec.LoadBalancerClass = ptr.To("test-load-balancer-class-changed") } testCases := []struct { diff --git a/pkg/registry/discovery/endpointslice/strategy_test.go b/pkg/registry/discovery/endpointslice/strategy_test.go index d4a081190bc..74daa9cbad9 100644 --- a/pkg/registry/discovery/endpointslice/strategy_test.go +++ b/pkg/registry/discovery/endpointslice/strategy_test.go @@ -29,7 +29,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/apis/discovery" "k8s.io/kubernetes/pkg/features" - utilpointer "k8s.io/utils/pointer" + ptr "k8s.io/utils/ptr" ) func Test_dropDisabledFieldsOnCreate(t *testing.T) { @@ -44,20 +44,20 @@ func Test_dropDisabledFieldsOnCreate(t *testing.T) { eps: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, @@ -101,20 +101,20 @@ func Test_dropDisabledFieldsOnUpdate(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, @@ -124,30 +124,30 @@ func Test_dropDisabledFieldsOnUpdate(t *testing.T) { oldEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1-old"), + NodeName: ptr.To("node-1-old"), }, { - NodeName: utilpointer.String("node-2-old"), + NodeName: ptr.To("node-2-old"), }, }, }, newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - NodeName: utilpointer.String("node-2"), + NodeName: ptr.To("node-2"), }, }, }, @@ -398,14 +398,14 @@ func Test_dropTopologyOnV1(t *testing.T) { v1Request: true, newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ - {Hostname: utilpointer.String("hostname-1")}, - {Hostname: utilpointer.String("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ - {Hostname: utilpointer.String("hostname-1")}, - {Hostname: utilpointer.String("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, }, }, }, @@ -413,14 +413,14 @@ func Test_dropTopologyOnV1(t *testing.T) { name: "v1beta1 request, without deprecated topology", newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ - {Hostname: utilpointer.String("hostname-1")}, - {Hostname: utilpointer.String("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ - {Hostname: utilpointer.String("hostname-1")}, - {Hostname: utilpointer.String("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, }, }, }, @@ -458,11 +458,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -473,11 +473,11 @@ func Test_dropTopologyOnV1(t *testing.T) { }, Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -488,11 +488,11 @@ func Test_dropTopologyOnV1(t *testing.T) { }, Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -503,11 +503,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -518,11 +518,11 @@ func Test_dropTopologyOnV1(t *testing.T) { }, Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -533,11 +533,11 @@ func Test_dropTopologyOnV1(t *testing.T) { }, Endpoints: []discovery.Endpoint{ { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, { - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), DeprecatedTopology: map[string]string{"key": "value"}, }, }, @@ -555,19 +555,19 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ - {Hostname: utilpointer.String("hostname-1")}, - {Hostname: utilpointer.String("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, + {Hostname: ptr.To("hostname-1")}, }, }, }, @@ -582,11 +582,11 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -594,11 +594,11 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -610,11 +610,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "other": "value"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "foo": "bar"}, }, }, @@ -622,11 +622,11 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "other": "value"}, }, { - Hostname: utilpointer.String("hostname-1b"), + Hostname: ptr.To("hostname-1b"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "foo": "bar"}, }, }, @@ -634,12 +634,12 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1a"), + NodeName: ptr.To("node-1"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-1"), }, }, }, @@ -650,11 +650,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -662,11 +662,11 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1b"), + Hostname: ptr.To("hostname-1b"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -674,12 +674,12 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1a"), + NodeName: ptr.To("node-1"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-1"), }, }, }, @@ -690,11 +690,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"}, }, }, @@ -702,11 +702,11 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"}, }, { - Hostname: utilpointer.String("hostname-1b"), + Hostname: ptr.To("hostname-1b"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -714,12 +714,12 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), - NodeName: utilpointer.String("node-2"), + Hostname: ptr.To("hostname-1a"), + NodeName: ptr.To("node-2"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-1"), }, }, }, @@ -730,11 +730,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"}, }, }, @@ -742,12 +742,12 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), // Invalid node name because it did not exist in previous version of EndpointSlice DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-3"}, }, { - Hostname: utilpointer.String("hostname-1b"), + Hostname: ptr.To("hostname-1b"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -755,11 +755,11 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-1"), }, }, }, @@ -770,11 +770,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -782,12 +782,12 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-2"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-2"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -795,12 +795,12 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1a"), + NodeName: ptr.To("node-1"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-2"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-2"), }, }, }, @@ -811,11 +811,11 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -823,13 +823,13 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), + Hostname: ptr.To("hostname-1a"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, - NodeName: utilpointer.String("node-1"), + NodeName: ptr.To("node-1"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-2"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-2"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"}, }, }, @@ -837,12 +837,12 @@ func Test_dropTopologyOnV1(t *testing.T) { expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1a"), - NodeName: utilpointer.String("node-1"), + Hostname: ptr.To("hostname-1a"), + NodeName: ptr.To("node-1"), }, { - Hostname: utilpointer.String("hostname-1b"), - NodeName: utilpointer.String("node-2"), + Hostname: ptr.To("hostname-1b"), + NodeName: ptr.To("node-2"), }, }, }, @@ -853,19 +853,19 @@ func Test_dropTopologyOnV1(t *testing.T) { originalEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-1"}, }, { - Hostname: utilpointer.String("hostname-2"), + Hostname: ptr.To("hostname-2"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-2"}, }, { - Hostname: utilpointer.String("hostname-3"), + Hostname: ptr.To("hostname-3"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-3"}, }, { - Hostname: utilpointer.String("hostname-4"), + Hostname: ptr.To("hostname-4"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-4"}, }, }, @@ -873,39 +873,39 @@ func Test_dropTopologyOnV1(t *testing.T) { newEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), + Hostname: ptr.To("hostname-1"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-1"}, }, { - Hostname: utilpointer.String("hostname-2"), + Hostname: ptr.To("hostname-2"), DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-2"}, }, { - Hostname: utilpointer.String("hostname-3"), - NodeName: utilpointer.String("node-3"), + Hostname: ptr.To("hostname-3"), + NodeName: ptr.To("node-3"), }, { - Hostname: utilpointer.String("hostname-4"), - NodeName: utilpointer.String("node-4"), + Hostname: ptr.To("hostname-4"), + NodeName: ptr.To("node-4"), }, }, }, expectedEPS: &discovery.EndpointSlice{ Endpoints: []discovery.Endpoint{ { - Hostname: utilpointer.String("hostname-1"), - NodeName: utilpointer.String("valid-node-1"), + Hostname: ptr.To("hostname-1"), + NodeName: ptr.To("valid-node-1"), }, { - Hostname: utilpointer.String("hostname-2"), + Hostname: ptr.To("hostname-2"), }, { - Hostname: utilpointer.String("hostname-3"), - NodeName: utilpointer.String("node-3"), + Hostname: ptr.To("hostname-3"), + NodeName: ptr.To("node-3"), }, { - Hostname: utilpointer.String("hostname-4"), - NodeName: utilpointer.String("node-4"), + Hostname: ptr.To("hostname-4"), + NodeName: ptr.To("node-4"), }, }, }, diff --git a/pkg/registry/storage/csinode/strategy_test.go b/pkg/registry/storage/csinode/strategy_test.go index e228a63a8d5..b003451bf09 100644 --- a/pkg/registry/storage/csinode/strategy_test.go +++ b/pkg/registry/storage/csinode/strategy_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/storage" - utilpointer "k8s.io/utils/pointer" + ptr "k8s.io/utils/ptr" ) func TestPrepareForCreate(t *testing.T) { @@ -92,7 +92,7 @@ func TestPrepareForUpdate(t *testing.T) { Name: "valid-driver-name", NodeID: "valid-node", TopologyKeys: []string{"company.com/zone1", "company.com/zone2"}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(20)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](20)}, }, }, }, @@ -251,7 +251,7 @@ func TestCSINodeValidation(t *testing.T) { Name: "$csi-driver@", NodeID: "valid-node", TopologyKeys: []string{"company.com/zone1", "company.com/zone2"}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(10)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](10)}, }, }, }, @@ -270,7 +270,7 @@ func TestCSINodeValidation(t *testing.T) { Name: "valid-driver-name", NodeID: "", TopologyKeys: []string{"company.com/zone1", "company.com/zone2"}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(10)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](10)}, }, }, }, @@ -289,7 +289,7 @@ func TestCSINodeValidation(t *testing.T) { Name: "valid-driver-name", NodeID: "valid-node", TopologyKeys: []string{"company.com/zone1", "company.com/zone2"}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(-1)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](-1)}, }, }, }, @@ -308,7 +308,7 @@ func TestCSINodeValidation(t *testing.T) { Name: "valid-driver-name", NodeID: "valid-node", TopologyKeys: []string{"company.com/zone1", ""}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(10)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](10)}, }, }, }, @@ -351,7 +351,7 @@ func getValidCSINode(name string) *storage.CSINode { Name: "valid-driver-name", NodeID: "valid-node", TopologyKeys: []string{"company.com/zone1", "company.com/zone2"}, - Allocatable: &storage.VolumeNodeResources{Count: utilpointer.Int32Ptr(10)}, + Allocatable: &storage.VolumeNodeResources{Count: ptr.To[int32](10)}, }, }, },