From d6ba9e1b9f7918fcc6dbd6f0f5258b335daee797 Mon Sep 17 00:00:00 2001 From: PatrickLaabs Date: Fri, 20 Jun 2025 07:07:42 +0200 Subject: [PATCH] replacing depr. pointer pkg with new ptr pkg on src/apimachinery --- .../apimachinery/lease/controller_test.go | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go index a82ee29fed7..2afceeafe1e 100644 --- a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go +++ b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go @@ -36,7 +36,6 @@ import ( "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" testingclock "k8s.io/utils/clock/testing" - "k8s.io/utils/pointer" "k8s.io/utils/ptr" "k8s.io/klog/v2" @@ -73,8 +72,8 @@ func TestNewNodeLease(t *testing.T) { Namespace: corev1.NamespaceNodeLease, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now()}, }, }, @@ -103,8 +102,8 @@ func TestNewNodeLease(t *testing.T) { }, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now()}, }, }, @@ -123,8 +122,8 @@ func TestNewNodeLease(t *testing.T) { Namespace: corev1.NamespaceNodeLease, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now().Add(-10 * time.Second)}, }, }, @@ -142,8 +141,8 @@ func TestNewNodeLease(t *testing.T) { }, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now()}, }, }, @@ -170,8 +169,8 @@ func TestNewNodeLease(t *testing.T) { }, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now().Add(-10 * time.Second)}, }, }, @@ -189,8 +188,8 @@ func TestNewNodeLease(t *testing.T) { }, }, Spec: coordinationv1.LeaseSpec{ - HolderIdentity: pointer.StringPtr(node.Name), - LeaseDurationSeconds: pointer.Int32Ptr(10), + HolderIdentity: ptr.To(node.Name), + LeaseDurationSeconds: ptr.To[int32](10), RenewTime: &metav1.MicroTime{Time: fakeClock.Now()}, }, },