Merge pull request #132638 from ylink-lfs/chore/admissionregistration_utilpointer_removal

k8s-ci-robot · web-flow · commit 77b5304f609e · 2025-07-01T11:35:31.000-07:00
chore: remove utilpointer usage in package pkg/apis/admissionregistration
diff --git a/pkg/apis/admissionregistration/v1/defaults.go b/pkg/apis/admissionregistration/v1/defaults.go
@@ -20,7 +20,7 @@ import (
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	utilpointer "k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
@@ -90,7 +90,7 @@ func SetDefaults_Rule(obj *admissionregistrationv1.Rule) {
 // SetDefaults_ServiceReference sets defaults for Webhook's ServiceReference
 func SetDefaults_ServiceReference(obj *admissionregistrationv1.ServiceReference) {
 	if obj.Port == nil {
-		obj.Port = utilpointer.Int32(443)
+		obj.Port = ptr.To[int32](443)
 	}
 }
 
diff --git a/pkg/apis/admissionregistration/v1/defaults_test.go b/pkg/apis/admissionregistration/v1/defaults_test.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	_ "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
-	utilpointer "k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestDefaultAdmissionWebhook(t *testing.T) {
@@ -107,7 +107,7 @@ func TestDefaultAdmissionWebhook(t *testing.T) {
 				Webhooks: []v1.MutatingWebhook{{
 					ClientConfig: v1.WebhookClientConfig{
 						Service: &v1.ServiceReference{
-							Port: utilpointer.Int32(443), // defaulted
+							Port: ptr.To[int32](443), // defaulted
 						},
 					},
 					FailurePolicy:      &fail,
diff --git a/pkg/apis/admissionregistration/v1beta1/defaults.go b/pkg/apis/admissionregistration/v1beta1/defaults.go
@@ -20,7 +20,7 @@ import (
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	utilpointer "k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
@@ -124,6 +124,6 @@ func SetDefaults_MutatingWebhook(obj *admissionregistrationv1beta1.MutatingWebho
 // SetDefaults_ServiceReference sets defaults for Webhook's ServiceReference
 func SetDefaults_ServiceReference(obj *admissionregistrationv1beta1.ServiceReference) {
 	if obj.Port == nil {
-		obj.Port = utilpointer.Int32(443)
+		obj.Port = ptr.To[int32](443)
 	}
 }
diff --git a/pkg/apis/admissionregistration/v1beta1/defaults_test.go b/pkg/apis/admissionregistration/v1beta1/defaults_test.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	_ "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
-	utilpointer "k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestDefaultAdmissionWebhook(t *testing.T) {
@@ -114,7 +114,7 @@ func TestDefaultAdmissionWebhook(t *testing.T) {
 				Webhooks: []v1beta1.MutatingWebhook{{
 					ClientConfig: v1beta1.WebhookClientConfig{
 						Service: &v1beta1.ServiceReference{
-							Port: utilpointer.Int32(443), // defaulted
+							Port: ptr.To[int32](443), // defaulted
 						},
 					},
 					FailurePolicy:           &ignore,

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`admissionregistrationv1 "k8s.io/api/admissionregistration/v1"`
`21`	`21`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`22`	`22`	`"k8s.io/apimachinery/pkg/runtime"`
`23`		`- utilpointer "k8s.io/utils/pointer"`
	`23`	`+ "k8s.io/utils/ptr"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func addDefaultingFuncs(scheme *runtime.Scheme) error {`
`@@ -90,7 +90,7 @@ func SetDefaults_Rule(obj *admissionregistrationv1.Rule) {`
`90`	`90`	`// SetDefaults_ServiceReference sets defaults for Webhook's ServiceReference`
`91`	`91`	`func SetDefaults_ServiceReference(obj *admissionregistrationv1.ServiceReference) {`
`92`	`92`	`if obj.Port == nil {`
`93`		`- obj.Port = utilpointer.Int32(443)`
	`93`	`+ obj.Port = ptr.To[int32](443)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`