Use k8s.io/apiextensions-api for CRD types and clients

Code that needs the conversions to the internal version still imports
them from k8s.io/apiextensions-apiserver.

cmd/kube-apiserver/app/server.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/admission"

cmd/kube-controller-manager/app/storageversionmigrator.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsclientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"

cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
+	apiextensionsscheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme"
 	pluginvalidatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
 	"k8s.io/apiserver/pkg/cel/openapi/resolver"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"

pkg/controller/storageversionmigrator/migrationrunner.go

@@ -23,10 +23,10 @@ import (
 	"sync"
 	"time"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	applyconfigurationapiextensionsv1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1"
+	apiextensionsclient "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	applyconfigurationapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1"
-	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"

pkg/controller/storageversionmigrator/migrationrunner_test.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 	svmv1 "k8s.io/api/storagemigration/v1"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
-	apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsfake "k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake"
+	apiextensionsscheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"

pkg/controlplane/apiserver/aggregator.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"sync"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsinformers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/controlplane/apiserver/apiextensions.go

@@ -17,8 +17,8 @@ limitations under the License.
 package apiserver
 
 import (
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	apiextensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
 	apiextensionsoptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/controlplane/apiserver/samples/generic/server/server.go

@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	_ "k8s.io/apiserver/pkg/admission"

pkg/controlplane/controller/crdregistration/crdregistration_controller.go

@@ -22,9 +22,9 @@ import (
 
 	"k8s.io/klog/v2"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	crdinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	crdinformers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	crdlisters "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	crdlisters "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"

staging/src/k8s.io/apiextensions-apiserver/pkg/apihelpers/helpers.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apihelpers/helpers_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install.go

@@ -17,9 +17,11 @@ limitations under the License.
 package install
 
 import (
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	v1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	v1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
@@ -27,7 +29,7 @@ import (
 // Install registers the API group and adds types to a scheme
 func Install(scheme *runtime.Scheme) {
 	utilruntime.Must(apiextensions.AddToScheme(scheme))
-	utilruntime.Must(v1beta1.AddToScheme(scheme))
-	utilruntime.Must(v1.AddToScheme(scheme))
+	utilruntime.Must(v1beta1conversion.AddToScheme(scheme))
+	utilruntime.Must(v1conversion.AddToScheme(scheme))
 	utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion))
 }

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go

@@ -20,13 +20,14 @@ import (
 	"bytes"
 	unsafe "unsafe"
 
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
-func Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error {
+func Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *v1.JSONSchemaProps, s conversion.Scope) error {
 	if err := autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in, out, s); err != nil {
 		return err
 	}
@@ -41,7 +42,7 @@ func Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensio
 
 var nullLiteral = []byte(`null`)
 
-func Convert_apiextensions_JSON_To_v1_JSON(in *apiextensions.JSON, out *JSON, s conversion.Scope) error {
+func Convert_apiextensions_JSON_To_v1_JSON(in *apiextensions.JSON, out *v1.JSON, s conversion.Scope) error {
 	raw, err := json.Marshal(*in)
 	if err != nil {
 		return err
@@ -55,7 +56,7 @@ func Convert_apiextensions_JSON_To_v1_JSON(in *apiextensions.JSON, out *JSON, s
 	return nil
 }
 
-func Convert_v1_JSON_To_apiextensions_JSON(in *JSON, out *apiextensions.JSON, s conversion.Scope) error {
+func Convert_v1_JSON_To_apiextensions_JSON(in *v1.JSON, out *apiextensions.JSON, s conversion.Scope) error {
 	if in != nil {
 		var i interface{}
 		if len(in.Raw) > 0 && !bytes.Equal(in.Raw, nullLiteral) {
@@ -70,19 +71,19 @@ func Convert_v1_JSON_To_apiextensions_JSON(in *JSON, out *apiextensions.JSON, s
 	return nil
 }
 
-func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error {
+func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *v1.CustomResourceDefinitionSpec, s conversion.Scope) error {
 	if err := autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(in, out, s); err != nil {
 		return err
 	}
 
 	if len(out.Versions) == 0 && len(in.Version) > 0 {
 		// no versions were specified, and a version name was specified
-		out.Versions = []CustomResourceDefinitionVersion{{Name: in.Version, Served: true, Storage: true}}
+		out.Versions = []v1.CustomResourceDefinitionVersion{{Name: in.Version, Served: true, Storage: true}}
 	}
 
 	// If spec.{subresources,validation,additionalPrinterColumns,selectableFields} exists, move to versions
 	if in.Subresources != nil {
-		subresources := &CustomResourceSubresources{}
+		subresources := &v1.CustomResourceSubresources{}
 		if err := Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in.Subresources, subresources, s); err != nil {
 			return err
 		}
@@ -91,7 +92,7 @@ func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefi
 		}
 	}
 	if in.Validation != nil {
-		schema := &CustomResourceValidation{}
+		schema := &v1.CustomResourceValidation{}
 		if err := Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in.Validation, schema, s); err != nil {
 			return err
 		}
@@ -100,7 +101,7 @@ func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefi
 		}
 	}
 	if in.AdditionalPrinterColumns != nil {
-		additionalPrinterColumns := make([]CustomResourceColumnDefinition, len(in.AdditionalPrinterColumns))
+		additionalPrinterColumns := make([]v1.CustomResourceColumnDefinition, len(in.AdditionalPrinterColumns))
 		for i := range in.AdditionalPrinterColumns {
 			if err := Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(&in.AdditionalPrinterColumns[i], &additionalPrinterColumns[i], s); err != nil {
 				return err
@@ -111,7 +112,7 @@ func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefi
 		}
 	}
 	if in.SelectableFields != nil {
-		selectableFields := make([]SelectableField, len(in.SelectableFields))
+		selectableFields := make([]v1.SelectableField, len(in.SelectableFields))
 		for i := range in.SelectableFields {
 			if err := Convert_apiextensions_SelectableField_To_v1_SelectableField(&in.SelectableFields[i], &selectableFields[i], s); err != nil {
 				return err
@@ -124,7 +125,7 @@ func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefi
 	return nil
 }
 
-func Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error {
+func Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *v1.CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error {
 	if err := autoConvert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in, out, s); err != nil {
 		return err
 	}
@@ -193,7 +194,7 @@ func Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefi
 	return nil
 }
 
-func Convert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error {
+func Convert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *v1.CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error {
 	if err := autoConvert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in, out, s); err != nil {
 		return err
 	}
@@ -212,17 +213,17 @@ func Convert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversi
 	return nil
 }
 
-func Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *CustomResourceConversion, s conversion.Scope) error {
+func Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *v1.CustomResourceConversion, s conversion.Scope) error {
 	if err := autoConvert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(in, out, s); err != nil {
 		return err
 	}
 
 	out.Webhook = nil
 	if in.WebhookClientConfig != nil || in.ConversionReviewVersions != nil {
-		out.Webhook = &WebhookConversion{}
+		out.Webhook = &v1.WebhookConversion{}
 		out.Webhook.ConversionReviewVersions = in.ConversionReviewVersions
 		if in.WebhookClientConfig != nil {
-			out.Webhook.ClientConfig = &WebhookClientConfig{}
+			out.Webhook.ClientConfig = &v1.WebhookClientConfig{}
 			if err := Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in.WebhookClientConfig, out.Webhook.ClientConfig, s); err != nil {
 				return err
 			}
@@ -231,7 +232,7 @@ func Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversi
 	return nil
 }
 
-func Convert_apiextensions_ValidationRules_To_v1_ValidationRules(in *apiextensions.ValidationRules, out *ValidationRules, s conversion.Scope) error {
-	*out = *(*ValidationRules)(unsafe.Pointer(in))
+func Convert_apiextensions_ValidationRules_To_v1_ValidationRules(in *apiextensions.ValidationRules, out *v1.ValidationRules, s conversion.Scope) error {
+	*out = *(*v1.ValidationRules)(unsafe.Pointer(in))
 	return nil
 }

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion_test.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/ptr"
@@ -42,8 +43,8 @@ func TestConversion(t *testing.T) {
 		{
 			Name:      "internal to v1, no versions",
 			In:        &apiextensions.CustomResourceDefinition{},
-			Out:       &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{},
+			Out:       &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{},
 		},
 		{
 			Name: "internal to v1, top-level version",
@@ -52,10 +53,10 @@ func TestConversion(t *testing.T) {
 					Version: "v1",
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{{Name: "v1", Served: true, Storage: true}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{{Name: "v1", Served: true, Storage: true}},
 				},
 			},
 		},
@@ -69,10 +70,10 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
 						{Name: "v1", Served: true, Storage: true},
 						{Name: "v2", Served: false, Storage: false},
 					},
@@ -81,7 +82,7 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, no versions",
-			In:   &CustomResourceDefinition{},
+			In:   &v1.CustomResourceDefinition{},
 			Out:  &apiextensions.CustomResourceDefinition{},
 			ExpectOut: &apiextensions.CustomResourceDefinition{
 				Spec: apiextensions.CustomResourceDefinitionSpec{
@@ -91,9 +92,9 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, single version",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{{Name: "v1", Served: true, Storage: true}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{{Name: "v1", Served: true, Storage: true}},
 				},
 			},
 			Out: &apiextensions.CustomResourceDefinition{},
@@ -107,9 +108,9 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, multiple versions",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
 						{Name: "v1", Served: true, Storage: true},
 						{Name: "v2", Served: false, Storage: false},
 					},
@@ -136,11 +137,11 @@ func TestConversion(t *testing.T) {
 					Validation: &apiextensions.CustomResourceValidation{OpenAPIV3Schema: &apiextensions.JSONSchemaProps{Type: "object"}},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Type: "object"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Type: "object"}}},
 					},
 				},
 			},
@@ -155,23 +156,23 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Description: "v1", Type: "object"}}},
-						{Name: "v2", Served: false, Storage: false, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Description: "v2", Type: "object"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Description: "v1", Type: "object"}}},
+						{Name: "v2", Served: false, Storage: false, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Description: "v2", Type: "object"}}},
 					},
 				},
 			},
 		},
 		{
 			Name: "v1 to internal, identical validation moves to top-level",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Type: "object"}}},
-						{Name: "v2", Served: true, Storage: false, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Type: "object"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Type: "object"}}},
+						{Name: "v2", Served: true, Storage: false, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Type: "object"}}},
 					},
 				},
 			},
@@ -190,11 +191,11 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, distinct validation remains per-version",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Description: "v1", Type: "object"}}},
-						{Name: "v2", Served: true, Storage: false, Schema: &CustomResourceValidation{OpenAPIV3Schema: &JSONSchemaProps{Description: "v2", Type: "object"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Description: "v1", Type: "object"}}},
+						{Name: "v2", Served: true, Storage: false, Schema: &v1.CustomResourceValidation{OpenAPIV3Schema: &v1.JSONSchemaProps{Description: "v2", Type: "object"}}},
 					},
 				},
 			},
@@ -219,11 +220,11 @@ func TestConversion(t *testing.T) {
 					Subresources: &apiextensions.CustomResourceSubresources{Scale: &apiextensions.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
 					},
 				},
 			},
@@ -238,23 +239,23 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas1"}}},
-						{Name: "v2", Served: false, Storage: false, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas2"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas1"}}},
+						{Name: "v2", Served: false, Storage: false, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas2"}}},
 					},
 				},
 			},
 		},
 		{
 			Name: "v1 to internal, identical subresources moves to top-level",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
-						{Name: "v2", Served: true, Storage: false, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
+						{Name: "v2", Served: true, Storage: false, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas"}}},
 					},
 				},
 			},
@@ -273,11 +274,11 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, distinct subresources remains per-version",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas1"}}},
-						{Name: "v2", Served: true, Storage: false, Subresources: &CustomResourceSubresources{Scale: &CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas2"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas1"}}},
+						{Name: "v2", Served: true, Storage: false, Subresources: &v1.CustomResourceSubresources{Scale: &v1.CustomResourceSubresourceScale{SpecReplicasPath: "spec.replicas2"}}},
 					},
 				},
 			},
@@ -302,11 +303,11 @@ func TestConversion(t *testing.T) {
 					AdditionalPrinterColumns: []apiextensions.CustomResourceColumnDefinition{{Name: "column1"}},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column1"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column1"}}},
 					},
 				},
 			},
@@ -321,23 +322,23 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column1"}}},
-						{Name: "v2", Served: false, Storage: false, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column2"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column1"}}},
+						{Name: "v2", Served: false, Storage: false, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column2"}}},
 					},
 				},
 			},
 		},
 		{
 			Name: "v1 to internal, identical printer columns moves to top-level",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column1"}}},
-						{Name: "v2", Served: true, Storage: false, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column1"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column1"}}},
+						{Name: "v2", Served: true, Storage: false, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column1"}}},
 					},
 				},
 			},
@@ -356,11 +357,11 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, distinct printer columns remains per-version",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column1"}}},
-						{Name: "v2", Served: true, Storage: false, AdditionalPrinterColumns: []CustomResourceColumnDefinition{{Name: "column2"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column1"}}},
+						{Name: "v2", Served: true, Storage: false, AdditionalPrinterColumns: []v1.CustomResourceColumnDefinition{{Name: "column2"}}},
 					},
 				},
 			},
@@ -388,11 +389,11 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
 					},
 				},
 			},
@@ -407,23 +408,23 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
-						{Name: "v2", Served: false, Storage: false, SelectableFields: []SelectableField{{JSONPath: ".spec.y"}}},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
+						{Name: "v2", Served: false, Storage: false, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.y"}}},
 					},
 				},
 			},
 		},
 		{
 			Name: "v1 to internal, identical selectable fields moves to top-level",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
-						{Name: "v2", Served: true, Storage: false, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
+						{Name: "v2", Served: true, Storage: false, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
 					},
 				},
 			},
@@ -442,10 +443,10 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, single selectable field moves to top-level",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
 					},
 				},
 			},
@@ -463,11 +464,11 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, distinct selectable fields remains per-version",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Versions: []CustomResourceDefinitionVersion{
-						{Name: "v1", Served: true, Storage: true, SelectableFields: []SelectableField{{JSONPath: ".spec.x"}}},
-						{Name: "v2", Served: true, Storage: false, SelectableFields: []SelectableField{{JSONPath: ".spec.y"}}},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Versions: []v1.CustomResourceDefinitionVersion{
+						{Name: "v1", Served: true, Storage: true, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.x"}}},
+						{Name: "v2", Served: true, Storage: false, SelectableFields: []v1.SelectableField{{JSONPath: ".spec.y"}}},
 					},
 				},
 			},
@@ -491,10 +492,10 @@ func TestConversion(t *testing.T) {
 					Conversion: &apiextensions.CustomResourceConversion{},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{},
 				},
 			},
 		},
@@ -507,12 +508,12 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{
-						Webhook: &WebhookConversion{
-							ClientConfig: &WebhookClientConfig{URL: ptr.To("http://example.com")},
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{
+						Webhook: &v1.WebhookConversion{
+							ClientConfig: &v1.WebhookClientConfig{URL: ptr.To("http://example.com")},
 						},
 					},
 				},
@@ -527,11 +528,11 @@ func TestConversion(t *testing.T) {
 					},
 				},
 			},
-			Out: &CustomResourceDefinition{},
-			ExpectOut: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{
-						Webhook: &WebhookConversion{
+			Out: &v1.CustomResourceDefinition{},
+			ExpectOut: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{
+						Webhook: &v1.WebhookConversion{
 							ConversionReviewVersions: []string{"v1"},
 						},
 					},
@@ -540,9 +541,9 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, no webhook client config",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{},
 				},
 			},
 			Out: &apiextensions.CustomResourceDefinition{},
@@ -555,11 +556,11 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, webhook client config",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{
-						Webhook: &WebhookConversion{
-							ClientConfig: &WebhookClientConfig{URL: ptr.To("http://example.com")},
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{
+						Webhook: &v1.WebhookConversion{
+							ClientConfig: &v1.WebhookClientConfig{URL: ptr.To("http://example.com")},
 						},
 					},
 				},
@@ -576,10 +577,10 @@ func TestConversion(t *testing.T) {
 		},
 		{
 			Name: "v1 to internal, webhook versions",
-			In: &CustomResourceDefinition{
-				Spec: CustomResourceDefinitionSpec{
-					Conversion: &CustomResourceConversion{
-						Webhook: &WebhookConversion{
+			In: &v1.CustomResourceDefinition{
+				Spec: v1.CustomResourceDefinitionSpec{
+					Conversion: &v1.CustomResourceConversion{
+						Webhook: &v1.WebhookConversion{
 							ConversionReviewVersions: []string{"v1"},
 						},
 					},
@@ -637,26 +638,26 @@ func TestJSONConversion(t *testing.T) {
 
 	testCases := map[string]struct {
 		input    *apiextensions.JSONSchemaProps
-		expected *JSONSchemaProps
+		expected *v1.JSONSchemaProps
 	}{
 		"nil": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: nil,
 			},
-			expected: &JSONSchemaProps{},
+			expected: &v1.JSONSchemaProps{},
 		},
 		"aliased nil": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &nilJSON,
 			},
-			expected: &JSONSchemaProps{},
+			expected: &v1.JSONSchemaProps{},
 		},
 		"null": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &nullJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1.JSONSchemaProps{
+				Default: &v1.JSON{
 					Raw: []byte(`"null"`),
 				},
 			},
@@ -665,8 +666,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &stringJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1.JSONSchemaProps{
+				Default: &v1.JSON{
 					Raw: []byte(`"foo"`),
 				},
 			},
@@ -675,8 +676,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &boolJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1.JSONSchemaProps{
+				Default: &v1.JSON{
 					Raw: []byte(`true`),
 				},
 			},
@@ -685,8 +686,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &sliceJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1.JSONSchemaProps{
+				Default: &v1.JSON{
 					Raw: []byte(`["foo","bar","baz"]`),
 				},
 			},
@@ -704,7 +705,7 @@ func TestJSONConversion(t *testing.T) {
 	}
 
 	for k, tc := range testCases {
-		external := &JSONSchemaProps{}
+		external := &v1.JSONSchemaProps{}
 		if err := scheme.Convert(tc.input, external, nil); err != nil {
 			t.Errorf("%s: unexpected error: %v", k, err)
 		}
@@ -744,7 +745,7 @@ func TestJSONRoundTrip(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			external := &JSONSchemaProps{}
+			external := &v1.JSONSchemaProps{}
 			if err := json.Unmarshal([]byte(tc.in), external); err != nil {
 				t.Fatal(err)
 			}
@@ -753,7 +754,7 @@ func TestJSONRoundTrip(t *testing.T) {
 			if err := scheme.Convert(external, internal, nil); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			roundtripped := &JSONSchemaProps{}
+			roundtripped := &v1.JSONSchemaProps{}
 			if err := scheme.Convert(internal, roundtripped, nil); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
@@ -774,7 +775,7 @@ func TestMemoryEqual(t *testing.T) {
 		a interface{}
 		b interface{}
 	}{
-		{apiextensions.JSONSchemaProps{}.XValidations, JSONSchemaProps{}.XValidations},
+		{apiextensions.JSONSchemaProps{}.XValidations, v1.JSONSchemaProps{}.XValidations},
 	}
 
 	for _, tc := range testcases {

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion.go

@@ -22,10 +22,11 @@ import (
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/util/json"
 
+	v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 )
 
-func Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error {
+func Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *v1beta1.JSONSchemaProps, s conversion.Scope) error {
 	if err := autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in, out, s); err != nil {
 		return err
 	}
@@ -40,7 +41,7 @@ func Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiext
 
 var nullLiteral = []byte(`null`)
 
-func Convert_apiextensions_JSON_To_v1beta1_JSON(in *apiextensions.JSON, out *JSON, s conversion.Scope) error {
+func Convert_apiextensions_JSON_To_v1beta1_JSON(in *apiextensions.JSON, out *v1beta1.JSON, s conversion.Scope) error {
 	raw, err := json.Marshal(*in)
 	if err != nil {
 		return err
@@ -54,7 +55,7 @@ func Convert_apiextensions_JSON_To_v1beta1_JSON(in *apiextensions.JSON, out *JSO
 	return nil
 }
 
-func Convert_v1beta1_JSON_To_apiextensions_JSON(in *JSON, out *apiextensions.JSON, s conversion.Scope) error {
+func Convert_v1beta1_JSON_To_apiextensions_JSON(in *v1beta1.JSON, out *apiextensions.JSON, s conversion.Scope) error {
 	if in != nil {
 		var i interface{}
 		if len(in.Raw) > 0 && !bytes.Equal(in.Raw, nullLiteral) {

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion_test.go

@@ -23,6 +23,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 
+	v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 )
 
@@ -35,26 +36,26 @@ func TestJSONConversion(t *testing.T) {
 
 	testCases := map[string]struct {
 		input    *apiextensions.JSONSchemaProps
-		expected *JSONSchemaProps
+		expected *v1beta1.JSONSchemaProps
 	}{
 		"nil": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: nil,
 			},
-			expected: &JSONSchemaProps{},
+			expected: &v1beta1.JSONSchemaProps{},
 		},
 		"aliased nil": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &nilJSON,
 			},
-			expected: &JSONSchemaProps{},
+			expected: &v1beta1.JSONSchemaProps{},
 		},
 		"null": {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &nullJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1beta1.JSONSchemaProps{
+				Default: &v1beta1.JSON{
 					Raw: []byte(`"null"`),
 				},
 			},
@@ -63,8 +64,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &stringJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1beta1.JSONSchemaProps{
+				Default: &v1beta1.JSON{
 					Raw: []byte(`"foo"`),
 				},
 			},
@@ -73,8 +74,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &boolJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1beta1.JSONSchemaProps{
+				Default: &v1beta1.JSON{
 					Raw: []byte(`true`),
 				},
 			},
@@ -83,8 +84,8 @@ func TestJSONConversion(t *testing.T) {
 			input: &apiextensions.JSONSchemaProps{
 				Default: &sliceJSON,
 			},
-			expected: &JSONSchemaProps{
-				Default: &JSON{
+			expected: &v1beta1.JSONSchemaProps{
+				Default: &v1beta1.JSON{
 					Raw: []byte(`["foo","bar","baz"]`),
 				},
 			},
@@ -102,7 +103,7 @@ func TestJSONConversion(t *testing.T) {
 	}
 
 	for k, tc := range testCases {
-		external := &JSONSchemaProps{}
+		external := &v1beta1.JSONSchemaProps{}
 		if err := scheme.Convert(tc.input, external, nil); err != nil {
 			t.Errorf("%s: unexpected error: %v", k, err)
 		}
@@ -142,7 +143,7 @@ func TestJSONRoundTrip(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			external := &JSONSchemaProps{}
+			external := &v1beta1.JSONSchemaProps{}
 			if err := json.Unmarshal([]byte(tc.in), external); err != nil {
 				t.Fatal(err)
 			}
@@ -151,7 +152,7 @@ func TestJSONRoundTrip(t *testing.T) {
 			if err := scheme.Convert(external, internal, nil); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			roundtripped := &JSONSchemaProps{}
+			roundtripped := &v1beta1.JSONSchemaProps{}
 			if err := scheme.Convert(internal, roundtripped, nil); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go

@@ -29,10 +29,10 @@ import (
 
 	celgo "github.com/google/cel-go/cel"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apihelpers"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
 	structuraldefaulting "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting"

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go

@@ -26,9 +26,10 @@ import (
 
 	"github.com/google/cel-go/cel"
 
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiextensionsfuzzer "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	celschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
@@ -11360,7 +11361,7 @@ func TestSchemaHasDefaults(t *testing.T) {
 		f.Fill(schema)
 
 		v1beta1Schema := &apiextensionsv1beta1.JSONSchemaProps{}
-		if err := apiextensionsv1beta1.Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(schema, v1beta1Schema, nil); err != nil {
+		if err := apiextensionsv1beta1conversion.Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(schema, v1beta1Schema, nil); err != nil {
 			t.Fatal(err)
 		}
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/roundtrip_test.go

@@ -24,10 +24,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/randfill"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	apiextensionsfuzzer "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -37,8 +39,8 @@ import (
 )
 
 var groups = []runtime.SchemeBuilder{
-	apiextensionsv1.SchemeBuilder,
-	apiextensionsv1beta1.SchemeBuilder,
+	apiextensionsv1conversion.SchemeBuilder,
+	apiextensionsv1beta1conversion.SchemeBuilder,
 }
 
 func TestCompatibility(t *testing.T) {

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go

@@ -22,13 +22,13 @@ import (
 	"net/http"
 	"time"
 
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
+	externalinformers "k8s.io/apiextensions-api/pkg/client/informers/externalversions"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	externalinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
 	"k8s.io/apiextensions-apiserver/pkg/controller/apiapproval"
 	"k8s.io/apiextensions-apiserver/pkg/controller/establish"
 	"k8s.io/apiextensions-apiserver/pkg/controller/finalizer"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/converter_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go

@@ -25,8 +25,8 @@ import (
 
 	"go.opentelemetry.io/otel/attribute"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	apivalidation "k8s.io/apimachinery/pkg/api/validation"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter_test.go

@@ -28,8 +28,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 )
 
 func TestRestoreObjectMeta(t *testing.T) {

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go

@@ -38,10 +38,10 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 )
 
 type DiscoveryController struct {

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller_test.go

@@ -23,10 +23,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 	apidiscoveryv2 "k8s.io/api/apidiscovery/v2"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
-	"k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake"
+	"k8s.io/apiextensions-api/pkg/client/informers/externalversions"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/endpoints/discovery"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go

@@ -29,17 +29,18 @@ import (
 
 	"sigs.k8s.io/structured-merge-diff/v7/fieldpath"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/conversion"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	structuraldefaulting "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting"
 	schemaobjectmeta "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/objectmeta"
 	structuralpruning "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/pruning"
 	apiservervalidation "k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/controller/establish"
 	"k8s.io/apiextensions-apiserver/pkg/controller/finalizer"
 	"k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder"
@@ -661,7 +662,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 			continue
 		}
 		internalValidation := &apiextensionsinternal.CustomResourceValidation{}
-		if err := apiextensionsv1.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(val, internalValidation, nil); err != nil {
+		if err := apiextensionsv1conversion.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(val, internalValidation, nil); err != nil {
 			return nil, fmt.Errorf("failed converting CRD validation to internal version: %v", err)
 		}
 		s, err := structuralschema.NewStructural(internalValidation.OpenAPIV3Schema)
@@ -802,7 +803,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 		var internalValidationSchema *apiextensionsinternal.CustomResourceValidation
 		if validationSchema != nil {
 			internalValidationSchema = &apiextensionsinternal.CustomResourceValidation{}
-			if err := apiextensionsv1.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(validationSchema, internalValidationSchema, nil); err != nil {
+			if err := apiextensionsv1conversion.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(validationSchema, internalValidationSchema, nil); err != nil {
 				return nil, fmt.Errorf("failed to convert CRD validation to internal version: %v", err)
 			}
 			internalSchemaProps = internalValidationSchema.OpenAPIV3Schema
@@ -818,7 +819,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 
 		if subresources != nil && subresources.Status != nil {
 			statusSpec = &apiextensionsinternal.CustomResourceSubresourceStatus{}
-			if err := apiextensionsv1.Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(subresources.Status, statusSpec, nil); err != nil {
+			if err := apiextensionsv1conversion.Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(subresources.Status, statusSpec, nil); err != nil {
 				return nil, fmt.Errorf("failed converting CRD status subresource to internal version: %v", err)
 			}
 			// for the status subresource, validate only against the status schema
@@ -835,7 +836,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 		var scaleSpec *apiextensionsinternal.CustomResourceSubresourceScale
 		if subresources != nil && subresources.Scale != nil {
 			scaleSpec = &apiextensionsinternal.CustomResourceSubresourceScale{}
-			if err := apiextensionsv1.Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(subresources.Scale, scaleSpec, nil); err != nil {
+			if err := apiextensionsv1conversion.Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(subresources.Scale, scaleSpec, nil); err != nil {
 				return nil, fmt.Errorf("failed converting CRD status subresource to internal version: %v", err)
 			}
 		}

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go

@@ -34,13 +34,13 @@ import (
 
 	"sigs.k8s.io/yaml"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/conversion"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/controller/establish"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/helpers.go

@@ -19,7 +19,7 @@ package apiserver
 import (
 	"fmt"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go

@@ -26,7 +26,7 @@ import (
 	"github.com/google/cel-go/checker"
 	"github.com/google/cel-go/common/types"
 
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensions "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apimachinery/pkg/util/version"
 	celconfig "k8s.io/apiserver/pkg/apis/cel"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/google/cel-go/common/types"
 	"github.com/google/cel-go/common/types/ref"
 
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensions "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/version"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go

@@ -31,7 +31,7 @@ import (
 	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/cel-go/interpreter"
 
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensions "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go

@@ -34,8 +34,9 @@ import (
 	"k8s.io/kube-openapi/pkg/validation/strfmt"
 	"k8s.io/utils/ptr"
 
+	apiextensions "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsconversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -3849,7 +3850,7 @@ func mustSchema(source string) *schema.Structural {
 		panic(err)
 	}
 	convertedProps := &apiextensionsinternal.JSONSchemaProps{}
-	if err := apiextensions.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(props, convertedProps, nil); err != nil {
+	if err := apiextensionsconversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(props, convertedProps, nil); err != nil {
 		panic(err)
 	}
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert_test.go

@@ -25,8 +25,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/randfill"
 
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
@@ -90,7 +91,7 @@ func TestStructuralRoundtripOrError(t *testing.T) {
 			t.Fatal(err)
 		}
 		internalSchema := &apiextensions.JSONSchemaProps{}
-		err = apiextensionsv1beta1.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
+		err = apiextensionsv1beta1conversion.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
 		if err != nil {
 			t.Fatal(err)
 		}

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/kubeopenapi_test.go

@@ -25,8 +25,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/randfill"
 
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
@@ -111,7 +112,7 @@ func TestStructuralKubeOpenAPIRoundtrip(t *testing.T) {
 			t.Fatal(err)
 		}
 		internalSchema := &apiextensions.JSONSchemaProps{}
-		err = apiextensionsv1beta1.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
+		err = apiextensionsv1beta1conversion.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
 		if err != nil {
 			t.Fatal(err)
 		}

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/structural.go

@@ -17,7 +17,7 @@ limitations under the License.
 package schema
 
 import (
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation.go

@@ -20,8 +20,9 @@ import (
 	"encoding/json"
 	"strings"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apiserver/pkg/cel/common"
@@ -380,7 +381,7 @@ func ConvertJSONSchemaPropsWithPostProcess(in *apiextensions.JSONSchemaProps, ou
 	}
 	if len(in.XValidations) != 0 {
 		var serializationValidationRules apiextensionsv1.ValidationRules
-		if err := apiextensionsv1.Convert_apiextensions_ValidationRules_To_v1_ValidationRules(&in.XValidations, &serializationValidationRules, nil); err != nil {
+		if err := apiextensionsv1conversion.Convert_apiextensions_ValidationRules_To_v1_ValidationRules(&in.XValidations, &serializationValidationRules, nil); err != nil {
 			return err
 		}
 		out.VendorExtensible.AddExtension("x-kubernetes-validations", convertSliceToInterfaceSlice(serializationValidationRules))

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation_test.go

@@ -35,9 +35,10 @@ import (
 
 	kubeopenapispec "k8s.io/kube-openapi/pkg/validation/spec"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiextensionsfuzzer "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
@@ -59,7 +60,7 @@ func TestRoundTrip(t *testing.T) {
 	if err := apiextensions.AddToScheme(scheme); err != nil {
 		t.Fatal(err)
 	}
-	if err := apiextensionsv1.AddToScheme(scheme); err != nil {
+	if err := apiextensionsv1conversion.AddToScheme(scheme); err != nil {
 		t.Fatal(err)
 	}
 

staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go

@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/pflag"
 	noopoteltrace "go.opentelemetry.io/otel/trace/noop"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver"
 	generatedopenapi "k8s.io/apiextensions-apiserver/pkg/generated/openapi"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller.go

@@ -22,11 +22,11 @@ import (
 	"sync"
 	"time"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	client "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller_test.go

@@ -19,7 +19,7 @@ package apiapproval
 import (
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/establish/establishing_controller.go

@@ -31,11 +31,11 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	client "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 )
 
 // EstablishingController controls how and when CRD is established.

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go

@@ -38,11 +38,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	client "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 )
 
 // OverlappingBuiltInResources returns the set of built-in group/resources that are persisted

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller.go

@@ -31,13 +31,14 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	client "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 )
 
 // ConditionController is maintaining the NonStructuralSchema condition.
@@ -105,7 +106,7 @@ func calculateCondition(in *apiextensionsv1.CustomResourceDefinition) *apiextens
 		}
 
 		internalSchema := &apiextensionsinternal.CustomResourceValidation{}
-		if err := apiextensionsv1.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(v.Schema, internalSchema, nil); err != nil {
+		if err := apiextensionsv1conversion.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(v.Schema, internalSchema, nil); err != nil {
 			klog.Errorf("failed to convert CRD validation to internal version: %v", err)
 			continue
 		}

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go

@@ -29,9 +29,10 @@ import (
 	"golang.org/x/text/language"
 
 	v1 "k8s.io/api/autoscaling/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	openapiv2 "k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2"
@@ -112,7 +113,7 @@ func generateBuilder(crd *apiextensionsv1.CustomResourceDefinition, version stri
 
 	if s != nil && s.OpenAPIV3Schema != nil {
 		internalCRDSchema := &apiextensionsinternal.CustomResourceValidation{}
-		if err := apiextensionsv1.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(s, internalCRDSchema, nil); err != nil {
+		if err := apiextensionsv1conversion.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(s, internalCRDSchema, nil); err != nil {
 			return nil, fmt.Errorf("failed converting CRD validation to internal version: %v", err)
 		}
 		if !validation.SchemaHasInvalidTypes(internalCRDSchema.OpenAPIV3Schema) {

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go

@@ -25,8 +25,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -197,7 +198,7 @@ func TestNewBuilder(t *testing.T) {
 					t.Fatal(err)
 				}
 				internalSchema := &apiextensionsinternal.JSONSchemaProps{}
-				apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
+				apiextensionsv1conversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v1beta1Schema, internalSchema, nil)
 				var err error
 				schema, err = structuralschema.NewStructural(internalSchema)
 				if err != nil {

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go

@@ -34,10 +34,10 @@ import (
 	"k8s.io/kube-openapi/pkg/handler"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller_test.go

@@ -24,10 +24,10 @@ import (
 	"testing"
 	"time"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
-	"k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake"
+	"k8s.io/apiextensions-api/pkg/client/informers/externalversions"
 	"k8s.io/kube-openapi/pkg/cached"
 	"k8s.io/kube-openapi/pkg/handler"
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go

@@ -30,8 +30,9 @@ import (
 	"sigs.k8s.io/randfill"
 
 	yaml "go.yaml.in/yaml/v2"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/kube-openapi/pkg/util/proto"
 	"k8s.io/kube-openapi/pkg/validation/spec"
@@ -92,7 +93,7 @@ properties:
 	}
 
 	specInternal := apiextensions.JSONSchemaProps{}
-	if err := apiextensionsv1beta1.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(&specV1beta1, &specInternal, nil); err != nil {
+	if err := apiextensionsv1beta1conversion.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(&specV1beta1, &specInternal, nil); err != nil {
 		t.Fatal(err)
 	}
 
@@ -740,7 +741,7 @@ func TestKubeOpenapiRejectionFiltering(t *testing.T) {
 
 		// convert to internal
 		internalSchema := &apiextensions.JSONSchemaProps{}
-		if err := apiextensionsv1beta1.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(schema, internalSchema, nil); err != nil {
+		if err := apiextensionsv1beta1conversion.Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(schema, internalSchema, nil); err != nil {
 			t.Fatalf("failed to convert from apiextensions/v1beta1 to internal: %v", err)
 		}
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapiv3/controller.go

@@ -33,10 +33,10 @@ import (
 	"k8s.io/kube-openapi/pkg/handler3"
 	"k8s.io/kube-openapi/pkg/spec3"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go

@@ -36,11 +36,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	client "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1"
+	informers "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
-	informers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 )
 
 // This controller is reserving names. To avoid conflicts, be sure to run only one instance of the worker at a time.

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller_test.go

@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	listers "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2/ktesting"

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd_test.go

@@ -41,8 +41,8 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver"
 	"k8s.io/apiextensions-apiserver/pkg/crdserverscheme"
 	"k8s.io/apiextensions-apiserver/pkg/registry/customresource"

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/status_strategy_test.go

@@ -21,9 +21,11 @@ import (
 	"reflect"
 	"testing"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -186,7 +188,7 @@ func TestStatusStrategyValidateUpdate(t *testing.T) {
 	}
 	t.Logf("crd v1 details: %v", crdV1)
 	crd := &apiextensions.CustomResourceDefinition{}
-	if err = apiextensionsv1.Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(crdV1, crd, nil); err != nil {
+	if err = apiextensionsv1conversion.Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(crdV1, crd, nil); err != nil {
 		t.Fatalf("unexpected convert error: %v", err)
 	}
 	t.Logf("crd details: %v", crd)
@@ -305,7 +307,7 @@ func TestStatusStrategyValidateUpdateForLegacyV1beta1(t *testing.T) {
 	}
 	t.Logf("crd details: %v", crdV1beta1)
 	crd := &apiextensions.CustomResourceDefinition{}
-	if err = apiextensionsv1beta1.Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(crdV1beta1, crd, nil); err != nil {
+	if err = apiextensionsv1beta1conversion.Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(crdV1beta1, crd, nil); err != nil {
 		t.Fatalf("unexpected convert error: %v", err)
 	}
 	t.Logf("crd details: %v", crd)

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/strategy.go

@@ -23,8 +23,8 @@ import (
 
 	"sigs.k8s.io/structured-merge-diff/v7/fieldpath"
 
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/strategy_test.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"testing"
 
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
 )

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor/tableconvertor.go

@@ -24,7 +24,7 @@ import (
 	"io"
 	"reflect"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metatable "k8s.io/apimachinery/pkg/api/meta/table"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/strategy_test.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
+	"k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation"
 	apiextensionsfeatures "k8s.io/apiextensions-apiserver/pkg/features"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/pkg/test/cel.go

@@ -24,8 +24,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -51,7 +52,7 @@ func FieldValidators(t *testing.T, crd *apiextensionsv1.CustomResourceDefinition
 	ret := map[string]map[string]CELValidateFunc{}
 	for _, v := range crd.Spec.Versions {
 		var internalSchema apiextensions.JSONSchemaProps
-		err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
+		err := apiextensionsv1conversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
 		require.NoError(t, err, "failed to convert JSONSchemaProps for version %s: %v", v.Name, err)
 		structuralSchema, err := schema.NewStructural(&internalSchema)
 		require.NoError(t, err, "failed to create StructuralSchema for version %s: %v", v.Name, err)
@@ -77,7 +78,7 @@ func VersionValidatorsFromFile(t *testing.T, crdFilePath string) map[string]CELV
 	ret := map[string]CELValidateFunc{}
 	for _, v := range crd.Spec.Versions {
 		var internalSchema apiextensions.JSONSchemaProps
-		err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
+		err := apiextensionsv1conversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
 		require.NoError(t, err, "failed to convert JSONSchemaProps for version %s: %v", v.Name, err)
 		structuralSchema, err := schema.NewStructural(&internalSchema)
 		require.NoError(t, err, "failed to create StructuralSchema for version %s: %v", v.Name, err)

staging/src/k8s.io/apiextensions-apiserver/pkg/test/example/apiexports_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apitest "k8s.io/apiextensions-apiserver/pkg/test"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/test/pattern.go

@@ -23,8 +23,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
@@ -35,7 +36,7 @@ func PatternValidators(t *testing.T, crd *apiextensionsv1.CustomResourceDefiniti
 	ret := map[string]map[string]PatternValidateFunc{}
 	for _, v := range crd.Spec.Versions {
 		var internalSchema apiextensions.JSONSchemaProps
-		err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
+		err := apiextensionsv1conversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(v.Schema.OpenAPIV3Schema, &internalSchema, nil)
 		require.NoError(t, err, "failed to convert JSONSchemaProps for version %s: %v", v.Name, err)
 		structuralSchema, err := schema.NewStructural(&internalSchema)
 		require.NoError(t, err, "failed to create StructuralSchema for version %s: %v", v.Name, err)

staging/src/k8s.io/apiextensions-apiserver/test/integration/apiapproval_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

staging/src/k8s.io/apiextensions-apiserver/test/integration/apply_test.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

staging/src/k8s.io/apiextensions-apiserver/test/integration/cabundle_test.go

@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 )
 

staging/src/k8s.io/apiextensions-apiserver/test/integration/cbor_test.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/google/uuid"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsclientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/change_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go

@@ -42,9 +42,9 @@ import (
 	"k8s.io/client-go/dynamic"
 	_ "k8s.io/component-base/logs/testinit" // enable logging flags
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	serveroptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apiextensions-apiserver/test/integration/storage"

staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go

@@ -31,8 +31,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

staging/src/k8s.io/apiextensions-apiserver/test/integration/defaulting_test.go

@@ -35,8 +35,8 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	serveroptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apiextensions-apiserver/test/integration/storage"

staging/src/k8s.io/apiextensions-apiserver/test/integration/deprecation_test.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

staging/src/k8s.io/apiextensions-apiserver/test/integration/fieldselector_test.go

@@ -29,8 +29,8 @@ import (
 	openapi_v2 "github.com/google/gnostic-models/openapiv2"
 	"sigs.k8s.io/yaml"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/conversion"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/meta"

staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/etcd.go

@@ -22,9 +22,9 @@ import (
 	"path"
 
 	clientv3 "go.etcd.io/etcd/client/v3"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/client-go/dynamic"

staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go

@@ -25,8 +25,8 @@ import (
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	clientv3 "go.etcd.io/etcd/client/v3"
 
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	serveroptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
 	servertesting "k8s.io/apiextensions-apiserver/pkg/cmd/server/testing"
 	"k8s.io/apimachinery/pkg/runtime/schema"

staging/src/k8s.io/apiextensions-apiserver/test/integration/helpers.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/limit_test.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"

staging/src/k8s.io/apiextensions-apiserver/test/integration/listtype_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go

@@ -38,8 +38,8 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/utils/ptr"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	serveroptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 )

staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	clientv3 "go.etcd.io/etcd/client/v3"
@@ -42,7 +42,7 @@ import (
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/client-go/dynamic"
 
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 )
 

staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test.go

@@ -32,11 +32,12 @@ import (
 
 	jsonpatch "gopkg.in/evanphx/json-patch.v4"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	apiservervalidation "k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/pkg/registry/customresource"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -1863,7 +1864,7 @@ func BenchmarkRatcheting(b *testing.B) {
 
 			// Create structural schema from v.Schema.OpenAPIV3Schema
 			internalValidation := &apiextensionsinternal.CustomResourceValidation{}
-			if err := apiextensionsv1.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(v.Schema, internalValidation, nil); err != nil {
+			if err := apiextensionsv1conversion.Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(v.Schema, internalValidation, nil); err != nil {
 				b.Fatal(fmt.Errorf("failed converting CRD validation to internal version: %v", err))
 				return
 			}

staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go

@@ -28,8 +28,8 @@ import (
 
 	clientv3 "go.etcd.io/etcd/client/v3"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsclientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go

@@ -25,7 +25,7 @@ import (
 
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	clientv3 "go.etcd.io/etcd/client/v3"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/storage/storagebackend"

staging/src/k8s.io/apiextensions-apiserver/test/integration/subresources_test.go

@@ -34,8 +34,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/utils/ptr"
 )

staging/src/k8s.io/apiextensions-apiserver/test/integration/table_test.go

@@ -32,8 +32,8 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 )
 

staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go

@@ -25,10 +25,12 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"
+	clientschema "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-	clientschema "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -2046,13 +2048,13 @@ properties:
 			betaCRD.Name = fmt.Sprintf("foos.%s", betaCRD.Spec.Group)
 
 			internalCRD := &apiextensions.CustomResourceDefinition{}
-			err = apiextensionsv1beta1.Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(betaCRD, internalCRD, nil)
+			err = apiextensionsv1beta1conversion.Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(betaCRD, internalCRD, nil)
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			crd := &apiextensionsv1.CustomResourceDefinition{}
-			err = apiextensionsv1.Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(internalCRD, crd, nil)
+			err = apiextensionsv1conversion.Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(internalCRD, crd, nil)
 			if err != nil {
 				t.Fatal(err)
 			}

staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiextensions-apiserver/test/integration/yaml_test.go

@@ -30,8 +30,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 )
 

test/e2e/apimachinery/aggregated_discovery.go

@@ -23,8 +23,8 @@ import (
 	"time"
 
 	apidiscoveryv2 "k8s.io/api/apidiscovery/v2"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionclientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

test/e2e/apimachinery/apply.go

@@ -23,8 +23,8 @@ import (
 	"reflect"
 
 	appsv1 "k8s.io/api/apps/v1"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	apiextensionclientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

test/e2e/apimachinery/crd_conversion_webhook.go

@@ -43,7 +43,7 @@ import (
 	admissionapi "k8s.io/pod-security-admission/api"
 	"k8s.io/utils/ptr"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration"
 )
 

test/e2e/apimachinery/crd_publish_openapi.go

@@ -34,8 +34,9 @@ import (
 	openapiutil "k8s.io/kube-openapi/pkg/util"
 	"k8s.io/utils/ptr"
 
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1conversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -701,7 +702,7 @@ func convertJSONSchemaProps(in []byte, out *spec.Schema) error {
 		return err
 	}
 	internal := apiextensions.JSONSchemaProps{}
-	if err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(&external, &internal, nil); err != nil {
+	if err := apiextensionsv1conversion.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(&external, &internal, nil); err != nil {
 		return err
 	}
 	kubeOut := spec.Schema{}

test/e2e/apimachinery/crd_selectable_fields.go

@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/e2e/apimachinery/crd_validation_ratcheting.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

test/e2e/apimachinery/crd_validation_rules.go

@@ -25,8 +25,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

test/e2e/apimachinery/crd_watch.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"
+	"k8s.io/apiextensions-api/pkg/client/clientset/clientset"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"