From d570ab8bc52c13d0c6acd6c61e0b3ff0755a8ace Mon Sep 17 00:00:00 2001 From: TommyStarK Date: Wed, 4 Jan 2023 14:12:32 +0100 Subject: [PATCH] plugin/pkg/admission: Replace deprecated pointer function Signed-off-by: TommyStarK --- .../defaultingressclass/admission_test.go | 20 +++++++++---------- .../noderestriction/admission_test.go | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugin/pkg/admission/network/defaultingressclass/admission_test.go b/plugin/pkg/admission/network/defaultingressclass/admission_test.go index 119faef6bbd..38eb3d71efb 100644 --- a/plugin/pkg/admission/network/defaultingressclass/admission_test.go +++ b/plugin/pkg/admission/network/defaultingressclass/admission_test.go @@ -134,30 +134,30 @@ func TestAdmission(t *testing.T) { classes: []*networkingv1.IngressClass{defaultClass1, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, classField: nil, classAnnotation: nil, - expectedClass: utilpointer.StringPtr(defaultClass1.Name), + expectedClass: utilpointer.String(defaultClass1.Name), expectedError: nil, }, { name: "one default, no modification of Ingress with class field=''", classes: []*networkingv1.IngressClass{defaultClass1, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, - classField: utilpointer.StringPtr(""), + classField: utilpointer.String(""), classAnnotation: nil, - expectedClass: utilpointer.StringPtr(""), + expectedClass: utilpointer.String(""), expectedError: nil, }, { name: "one default, no modification of Ingress with class field='foo'", classes: []*networkingv1.IngressClass{defaultClass1, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, - classField: utilpointer.StringPtr("foo"), + classField: utilpointer.String("foo"), classAnnotation: nil, - expectedClass: utilpointer.StringPtr("foo"), + expectedClass: utilpointer.String("foo"), expectedError: nil, }, { name: "one default, no modification of Ingress with class annotation='foo'", classes: []*networkingv1.IngressClass{defaultClass1, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, classField: nil, - classAnnotation: utilpointer.StringPtr("foo"), + classAnnotation: utilpointer.String("foo"), expectedClass: nil, expectedError: nil, }, @@ -166,15 +166,15 @@ func TestAdmission(t *testing.T) { classes: []*networkingv1.IngressClass{defaultClass1, defaultClass2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, classField: nil, classAnnotation: nil, - expectedClass: utilpointer.StringPtr(defaultClass1.Name), + expectedClass: utilpointer.String(defaultClass1.Name), expectedError: nil, }, { name: "two defaults, no modification with Ingress with class field=''", classes: []*networkingv1.IngressClass{defaultClass1, defaultClass2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, - classField: utilpointer.StringPtr(""), + classField: utilpointer.String(""), classAnnotation: nil, - expectedClass: utilpointer.StringPtr(""), + expectedClass: utilpointer.String(""), expectedError: nil, }, { @@ -182,7 +182,7 @@ func TestAdmission(t *testing.T) { classes: []*networkingv1.IngressClass{defaultClassWithCreateTime1, defaultClassWithCreateTime2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault}, classField: nil, classAnnotation: nil, - expectedClass: utilpointer.StringPtr(defaultClassWithCreateTime1.Name), + expectedClass: utilpointer.String(defaultClassWithCreateTime1.Name), expectedError: nil, }, } diff --git a/plugin/pkg/admission/noderestriction/admission_test.go b/plugin/pkg/admission/noderestriction/admission_test.go index f5450ad5f87..dbfec0e6ed8 100644 --- a/plugin/pkg/admission/noderestriction/admission_test.go +++ b/plugin/pkg/admission/noderestriction/admission_test.go @@ -297,8 +297,8 @@ func Test_nodePlugin_Admit(t *testing.T) { Namespace: api.NamespaceNodeLease, }, Spec: coordination.LeaseSpec{ - HolderIdentity: pointer.StringPtr("mynode"), - LeaseDurationSeconds: pointer.Int32Ptr(40), + HolderIdentity: pointer.String("mynode"), + LeaseDurationSeconds: pointer.Int32(40), RenewTime: &metav1.MicroTime{Time: time.Now()}, }, } @@ -308,8 +308,8 @@ func Test_nodePlugin_Admit(t *testing.T) { Namespace: "foo", }, Spec: coordination.LeaseSpec{ - HolderIdentity: pointer.StringPtr("mynode"), - LeaseDurationSeconds: pointer.Int32Ptr(40), + HolderIdentity: pointer.String("mynode"), + LeaseDurationSeconds: pointer.Int32(40), RenewTime: &metav1.MicroTime{Time: time.Now()}, }, } @@ -319,8 +319,8 @@ func Test_nodePlugin_Admit(t *testing.T) { Namespace: api.NamespaceNodeLease, }, Spec: coordination.LeaseSpec{ - HolderIdentity: pointer.StringPtr("mynode"), - LeaseDurationSeconds: pointer.Int32Ptr(40), + HolderIdentity: pointer.String("mynode"), + LeaseDurationSeconds: pointer.Int32(40), RenewTime: &metav1.MicroTime{Time: time.Now()}, }, }