diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go index 1a30e2b8230..5dbc35b0c6d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go @@ -32,7 +32,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/endpoints" "k8s.io/kube-openapi/pkg/validation/spec" - utilpointer "k8s.io/utils/pointer" "k8s.io/utils/ptr" ) @@ -479,7 +478,7 @@ func TestBuildOpenAPIV2(t *testing.T) { } } if tt.preserveUnknownFields != nil && *tt.preserveUnknownFields { - validation.OpenAPIV3Schema.XPreserveUnknownFields = utilpointer.BoolPtr(true) + validation.OpenAPIV3Schema.XPreserveUnknownFields = ptr.To(true) } // TODO: mostly copied from the test above. reuse code to cleanup @@ -589,7 +588,7 @@ func TestBuildOpenAPIV3(t *testing.T) { } } if tt.preserveUnknownFields != nil && *tt.preserveUnknownFields { - validation.OpenAPIV3Schema.XPreserveUnknownFields = utilpointer.BoolPtr(true) + validation.OpenAPIV3Schema.XPreserveUnknownFields = ptr.To(true) } got, err := BuildOpenAPIV3(&apiextensionsv1.CustomResourceDefinition{ diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go index 53544764b5b..76363d945b4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go @@ -35,7 +35,7 @@ import ( structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema" "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/validation/spec" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func Test_ConvertJSONSchemaPropsToOpenAPIv2Schema(t *testing.T) { @@ -646,7 +646,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) { { name: "preserve-unknown-fields in arrays", in: &apiextensions.JSONSchemaProps{ - XPreserveUnknownFields: pointer.BoolPtr(true), + XPreserveUnknownFields: ptr.To(true), Type: "array", Items: &apiextensions.JSONSchemaPropsOrArray{Schema: &apiextensions.JSONSchemaProps{ Type: "string", @@ -657,7 +657,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) { { name: "preserve-unknown-fields in objects", in: &apiextensions.JSONSchemaProps{ - XPreserveUnknownFields: pointer.BoolPtr(true), + XPreserveUnknownFields: ptr.To(true), Type: "object", Properties: map[string]apiextensions.JSONSchemaProps{ "foo": {