Merge pull request #133180 from ylink-lfs/chore/ptr_cast_replace

chore: replace ptr caster with unified ptr.To

Kubernetes-commit: 9409af4b80b9dee917e6d043194afc012013f097

Author: k8s-publishing-bot

go.mod

@@ -126,3 +126,5 @@ require (
 	k8s.io/kms v0.0.0-20250716213631-bbefe5cb7a2e // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 )
+
+replace k8s.io/api => k8s.io/api v0.0.0-20250725024535-9bc89ec036ec

go.sum

@@ -291,8 +291,8 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.0.0-20250725024535-b95b43d5b95d h1:OdC1L69BYvh/4HX6Wgg7DeL0A++gD3gadKfaWT4IdbA=
-k8s.io/api v0.0.0-20250725024535-b95b43d5b95d/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
+k8s.io/api v0.0.0-20250725024535-9bc89ec036ec h1:Hr5ELh7ZNxCxze+o+zSYW8H7+Jhc/zsqpNP+g8vYzAE=
+k8s.io/api v0.0.0-20250725024535-9bc89ec036ec/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
 k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4 h1:N25HX4lRPTvLHSUPoCMFP+B/oEcOmPESB+BRkYMD8Io=
 k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
 k8s.io/apiserver v0.0.0-20250725030654-b0d4f2b90481 h1:WiDL92SUsqJ27AP3O/OQjWXFiSMWiqeOAGoSA30pLmU=

pkg/apiserver/validation/ratcheting_test.go

@@ -24,35 +24,36 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 	"k8s.io/kube-openapi/pkg/validation/strfmt"
+	"k8s.io/utils/ptr"
 )
 
 var zeroIntSchema *spec.Schema = &spec.Schema{
 	SchemaProps: spec.SchemaProps{
 		Type:    spec.StringOrArray{"number"},
-		Minimum: ptr(float64(0)),
-		Maximum: ptr(float64(0)),
+		Minimum: ptr.To[float64](0),
+		Maximum: ptr.To[float64](0),
 	},
 }
 
 var smallIntSchema *spec.Schema = &spec.Schema{
 	SchemaProps: spec.SchemaProps{
 		Type:    spec.StringOrArray{"number"},
-		Maximum: ptr(float64(50)),
+		Maximum: ptr.To[float64](50),
 	},
 }
 
 var mediumIntSchema *spec.Schema = &spec.Schema{
 	SchemaProps: spec.SchemaProps{
 		Type:    spec.StringOrArray{"number"},
-		Minimum: ptr(float64(50)),
-		Maximum: ptr(float64(10000)),
+		Minimum: ptr.To[float64](50),
+		Maximum: ptr.To[float64](10000),
 	},
 }
 
 var largeIntSchema *spec.Schema = &spec.Schema{
 	SchemaProps: spec.SchemaProps{
 		Type:    spec.StringOrArray{"number"},
-		Minimum: ptr(float64(10000)),
+		Minimum: ptr.To[float64](10000),
 	},
 }
 
@@ -130,7 +131,3 @@ func TestObjectObjectFieldsRatcheting(t *testing.T) {
 			"small": 501,
 		}}, validation.WithRatcheting(nil)).IsValid())
 }
-
-func ptr[T any](v T) *T {
-	return &v
-}

test/integration/ratcheting_test.go

@@ -55,6 +55,7 @@ import (
 	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 	"k8s.io/kube-openapi/pkg/validation/strfmt"
+	"k8s.io/utils/ptr"
 )
 
 var stringSchema *apiextensionsv1.JSONSchemaProps = &apiextensionsv1.JSONSchemaProps{
@@ -1115,7 +1116,7 @@ func TestRatchetingFunctionality(t *testing.T) {
 					Properties: map[string]apiextensionsv1.JSONSchemaProps{
 						"field": {
 							Type:         "array",
-							XListType:    ptr("map"),
+							XListType:    ptr.To("map"),
 							XListMapKeys: []string{"name", "port"},
 							Items: &apiextensionsv1.JSONSchemaPropsOrArray{
 								Schema: &apiextensionsv1.JSONSchemaProps{
@@ -1395,7 +1396,7 @@ func TestRatchetingFunctionality(t *testing.T) {
 								{
 									Rule:            "!oldSelf.hasValue()",
 									Message:         "oldSelf must be null",
-									OptionalOldSelf: ptr(true),
+									OptionalOldSelf: ptr.To(true),
 								},
 							},
 						},
@@ -1445,7 +1446,7 @@ func TestRatchetingFunctionality(t *testing.T) {
 			Operations: []ratchetingTestOperation{
 				updateMyCRDV1Beta1Schema{&apiextensionsv1.JSONSchemaProps{
 					Type:                   "object",
-					XPreserveUnknownFields: ptr(true),
+					XPreserveUnknownFields: ptr.To(true),
 				}},
 				applyPatchOperation{
 					"create instance with strings that do not start with k8s",
@@ -1457,7 +1458,7 @@ func TestRatchetingFunctionality(t *testing.T) {
 				},
 				updateMyCRDV1Beta1Schema{&apiextensionsv1.JSONSchemaProps{
 					Type:                   "object",
-					XPreserveUnknownFields: ptr(true),
+					XPreserveUnknownFields: ptr.To(true),
 					Properties: map[string]apiextensionsv1.JSONSchemaProps{
 						"myStringField": {
 							Type: "string",
@@ -1759,10 +1760,6 @@ func TestRatchetingFunctionality(t *testing.T) {
 	runTests(t, cases)
 }
 
-func ptr[T any](v T) *T {
-	return &v
-}
-
 type validator func(new, old *unstructured.Unstructured)
 
 func newValidator(customResourceValidation *apiextensionsinternal.JSONSchemaProps, kind schema.GroupVersionKind, namespaceScoped bool) (validator, error) {
@@ -2031,7 +2028,7 @@ func TestRatchetingDropFields(t *testing.T) {
 											{
 												// Results in error if field wasn't dropped
 												Rule:            "self == oldSelf",
-												OptionalOldSelf: ptr(true),
+												OptionalOldSelf: ptr.To(true),
 											},
 										},
 									},
@@ -2064,7 +2061,7 @@ func TestRatchetingDropFields(t *testing.T) {
 		if err != nil {
 			return false, err
 		}
-		existing.Spec.Versions[0].Schema.OpenAPIV3Schema.Properties["spec"].Properties["field"].XValidations[0].OptionalOldSelf = ptr(true)
+		existing.Spec.Versions[0].Schema.OpenAPIV3Schema.Properties["spec"].Properties["field"].XValidations[0].OptionalOldSelf = ptr.To(true)
 		updated, err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Update(context.TODO(), existing, metav1.UpdateOptions{})
 		if err != nil {
 			if apierrors.IsConflict(err) {