From e6eac1061e7132af1fd333a18c0af318b207a835 Mon Sep 17 00:00:00 2001 From: Yongrui Lin Date: Wed, 7 Oct 2026 17:05:02 +0000 Subject: [PATCH] Update generated files --- .../apiextensions_violation_exceptions.list | 62 +-- api/api-rules/violation_exceptions.list | 62 +-- go.mod | 2 + go.work | 1 + pkg/generated/openapi/zz_generated.openapi.go | 4 +- staging/src/k8s.io/apiextensions-api/go.mod | 58 +++ staging/src/k8s.io/apiextensions-api/go.sum | 97 ++++ .../pkg/apis/apiextensions/v1/generated.pb.go | 2 +- .../pkg/apis/apiextensions/v1/generated.proto | 4 +- .../apiextensions/v1beta1/generated.pb.go | 2 +- .../apiextensions/v1beta1/generated.proto | 4 +- .../v1/customresourceconversion.go | 2 +- .../v1/customresourcedefinition.go | 4 +- .../v1/customresourcedefinitioncondition.go | 2 +- .../v1/customresourcedefinitionspec.go | 2 +- .../v1/customresourcesubresources.go | 2 +- .../apiextensions/v1/jsonschemaprops.go | 2 +- .../apiextensions/v1/validationrule.go | 2 +- .../v1beta1/customresourceconversion.go | 2 +- .../v1beta1/customresourcedefinition.go | 4 +- .../customresourcedefinitioncondition.go | 2 +- .../v1beta1/customresourcedefinitionspec.go | 2 +- .../v1beta1/customresourcesubresources.go | 2 +- .../apiextensions/v1beta1/jsonschemaprops.go | 2 +- .../apiextensions/v1beta1/validationrule.go | 2 +- .../pkg/client/applyconfiguration/utils.go | 10 +- .../client/clientset/clientset/clientset.go | 4 +- .../clientset/fake/clientset_generated.go | 12 +- .../clientset/clientset/fake/register.go | 4 +- .../clientset/clientset/scheme/register.go | 4 +- .../apiextensions/v1/apiextensions_client.go | 4 +- .../v1/customresourcedefinition.go | 6 +- .../v1/fake/fake_apiextensions_client.go | 2 +- .../v1/fake/fake_customresourcedefinition.go | 6 +- .../v1beta1/apiextensions_client.go | 4 +- .../v1beta1/customresourcedefinition.go | 6 +- .../v1beta1/fake/fake_apiextensions_client.go | 2 +- .../fake/fake_customresourcedefinition.go | 6 +- .../apiextensions/interface.go | 6 +- .../v1/customresourcedefinition.go | 8 +- .../apiextensions/v1/interface.go | 2 +- .../v1beta1/customresourcedefinition.go | 8 +- .../apiextensions/v1beta1/interface.go | 2 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 4 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../v1/customresourcedefinition.go | 2 +- .../v1beta1/customresourcedefinition.go | 2 +- .../src/k8s.io/apiextensions-apiserver/go.mod | 4 +- .../v1/zz_generated.conversion.go | 451 ++++++++--------- .../v1beta1/zz_generated.conversion.go | 465 +++++++++--------- .../apiserver/schema/zz_generated.deepcopy.go | 2 +- .../generated/openapi/zz_generated.openapi.go | 4 +- vendor/modules.txt | 2 + 54 files changed, 767 insertions(+), 603 deletions(-) create mode 100644 staging/src/k8s.io/apiextensions-api/go.mod create mode 100644 staging/src/k8s.io/apiextensions-api/go.sum diff --git a/api/api-rules/apiextensions_violation_exceptions.list b/api/api-rules/apiextensions_violation_exceptions.list index 6859a85a84d..7af1f835084 100644 --- a/api/api-rules/apiextensions_violation_exceptions.list +++ b/api/api-rules/apiextensions_violation_exceptions.list @@ -1,34 +1,34 @@ -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XIntOrString -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListMapKeys -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XMapType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XPreserveUnknownFields -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XValidations -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,JSONSchemas -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Allows -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,CustomResourceColumnDefinition,JSONPath -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Ref -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XEmbeddedResource -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XIntOrString -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListMapKeys -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XMapType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XPreserveUnknownFields -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XValidations -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,JSONSchemas -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Allows -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Property -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XIntOrString +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XListMapKeys +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XListType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XMapType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XPreserveUnknownFields +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XValidations +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,JSONSchemas +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Allows +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,CustomResourceColumnDefinition,JSONPath +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Ref +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XEmbeddedResource +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XIntOrString +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListMapKeys +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XMapType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XPreserveUnknownFields +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XValidations +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,JSONSchemas +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Allows +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Property +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Schema API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,Format API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,scale API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,value diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index cefe8376d1e..36ff0d3e325 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -79,37 +79,37 @@ API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,Stri API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,VersionValue API rule violation: names_match,k8s.io/api/resource/v1beta2,DeviceAttribute,VersionValues API rule violation: names_match,k8s.io/api/resource/v1beta2,NetworkDeviceData,IPs -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XIntOrString -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListMapKeys -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XMapType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XPreserveUnknownFields -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XValidations -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,JSONSchemas -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Allows -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,CustomResourceColumnDefinition,JSONPath -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Ref -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XEmbeddedResource -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XIntOrString -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListMapKeys -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XMapType -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XPreserveUnknownFields -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XValidations -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,JSONSchemas -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Allows -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Schema -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Property -API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XIntOrString +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XListMapKeys +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XListType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XMapType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XPreserveUnknownFields +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaProps,XValidations +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,JSONSchemas +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Allows +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,CustomResourceColumnDefinition,JSONPath +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Ref +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XEmbeddedResource +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XIntOrString +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListMapKeys +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XListType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XMapType +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XPreserveUnknownFields +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaProps,XValidations +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,JSONSchemas +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrArray,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Allows +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrBool,Schema +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Property +API rule violation: names_match,k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1,JSONSchemaPropsOrStringArray,Schema API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,Format API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,scale API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,value diff --git a/go.mod b/go.mod index a6df09eded5..cf24beba3c4 100644 --- a/go.mod +++ b/go.mod @@ -84,6 +84,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 gopkg.in/inf.v0 v0.9.1 k8s.io/api v0.0.0 + k8s.io/apiextensions-api v0.0.0 k8s.io/apiextensions-apiserver v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/apiserver v0.0.0 @@ -216,6 +217,7 @@ require ( replace ( k8s.io/api => ./staging/src/k8s.io/api + k8s.io/apiextensions-api => ./staging/src/k8s.io/apiextensions-api k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver k8s.io/apimachinery => ./staging/src/k8s.io/apimachinery k8s.io/apiserver => ./staging/src/k8s.io/apiserver diff --git a/go.work b/go.work index bff4c210e78..868b0fa35f6 100644 --- a/go.work +++ b/go.work @@ -7,6 +7,7 @@ godebug default=go1.27 use ( . ./staging/src/k8s.io/api + ./staging/src/k8s.io/apiextensions-api ./staging/src/k8s.io/apiextensions-apiserver ./staging/src/k8s.io/apimachinery ./staging/src/k8s.io/apiserver diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 6510f05b31e..0d4272c6c6f 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -81,8 +81,8 @@ import ( storagev1beta1 "k8s.io/api/storage/v1beta1" storagemigrationv1 "k8s.io/api/storagemigration/v1" storagemigrationv1beta1 "k8s.io/api/storagemigration/v1beta1" - 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" resource "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/staging/src/k8s.io/apiextensions-api/go.mod b/staging/src/k8s.io/apiextensions-api/go.mod new file mode 100644 index 00000000000..983bd3fb4ef --- /dev/null +++ b/staging/src/k8s.io/apiextensions-api/go.mod @@ -0,0 +1,58 @@ +// This is a generated file. Do not edit directly. + +module k8s.io/apiextensions-api + +go 1.27.0 + +godebug default=go1.27 + +require ( + github.com/fxamacker/cbor/v2 v2.9.4 + github.com/google/go-cmp v0.7.0 + github.com/stretchr/testify v1.12.1 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/utils v0.0.0-20260626114624-be93311217bd + sigs.k8s.io/structured-merge-diff/v7 v7.0.1 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/go-logr/logr v1.4.4 // indirect + github.com/go-openapi/jsonpointer v1.0.2 // indirect + github.com/go-openapi/jsonreference v1.0.2 // indirect + github.com/go-openapi/swag/conv v0.29.2 // indirect + github.com/go-openapi/swag/jsonutils v0.29.2 // indirect + github.com/go-openapi/swag/pools v0.29.2 // indirect + github.com/go-openapi/swag/typeutils v0.29.2 // indirect + github.com/google/gnostic-models v0.7.1 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/x448/float16 v0.8.4 // indirect + go.yaml.in/yaml/v2 v2.4.4 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/net v0.61.0 // indirect + golang.org/x/oauth2 v0.37.0 // indirect + golang.org/x/sys v0.49.0 // indirect + golang.org/x/term v0.47.0 // indirect + golang.org/x/text v0.43.0 // indirect + golang.org/x/time v0.16.0 // indirect + google.golang.org/protobuf v1.36.12 // indirect + gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + k8s.io/api v0.0.0 // indirect + k8s.io/klog/v2 v2.140.0 // indirect + k8s.io/kube-openapi v0.0.0-20261014044854-ca3452a79603 // indirect + sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect + sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect +) + +replace ( + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/ktesting => ../ktesting + k8s.io/streaming => ../streaming +) diff --git a/staging/src/k8s.io/apiextensions-api/go.sum b/staging/src/k8s.io/apiextensions-api/go.sum new file mode 100644 index 00000000000..a19344b5bc1 --- /dev/null +++ b/staging/src/k8s.io/apiextensions-api/go.sum @@ -0,0 +1,97 @@ +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo= +github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-openapi/jsonpointer v1.0.2 h1:NbW7xT2b+l7x+JefiPGDsZWsrLk1ogrz4AHK1TTzMt8= +github.com/go-openapi/jsonpointer v1.0.2/go.mod h1:N0rI4MbNKD7xAFTiHtB+5Nhrg2j/wwYg7m7Fmb4/jk8= +github.com/go-openapi/jsonreference v1.0.2 h1:oS4et8FOf3p3UQxEo4Xt0esijmBUM+F259Xl72OSZsc= +github.com/go-openapi/jsonreference v1.0.2/go.mod h1:TbUNSOo+fcorZjFaNoiSDSoaNnnZtqJtLGR1PuvE/Cs= +github.com/go-openapi/swag/conv v0.29.2 h1:8c9shoB8l0QRSR6ymq1llHdBWDqpIgJfjTGHx3Vuhm0= +github.com/go-openapi/swag/conv v0.29.2/go.mod h1:AZS0YigTNf8qNtD6WqJz/N4RUNmpr76SyjFGkq4+p6Q= +github.com/go-openapi/swag/jsonutils v0.29.2 h1:uZNSD2/rJDYAfvsLYkykTzXuyxM3QpDKV9jhRHrMu6k= +github.com/go-openapi/swag/jsonutils v0.29.2/go.mod h1:ONTdNvj3Y+IXRzfa17E+Rgt2ns/qiSOYjIo2K7v2yDs= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2 h1:w+Fd6EBOMGlC74GYGHqCLGyb3Bpams8TtNrgM/SG4jo= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2/go.mod h1:HC2egPORFzbj/gf05Zrfgz8Mgplx3oW7hgGi7pjZVhM= +github.com/go-openapi/swag/pools v0.29.2 h1:PlGoDRF8WtSyXkedZZkpW3f9wDhFf3u8KtaBcmgmh8c= +github.com/go-openapi/swag/pools v0.29.2/go.mod h1:V3lhxVT4qDYRqc2MRSSbLsTYIYV/2HlHafhyEkmzLIc= +github.com/go-openapi/swag/typeutils v0.29.2 h1:O7aVvkTs3pXwikgtrPLenigEMdQFgONKRooQA9pgf2I= +github.com/go-openapi/swag/typeutils v0.29.2/go.mod h1:7+GDG+uz9Ke+eVt4rClZg7wklSDp8hT/mKNh/pC26TE= +github.com/go-openapi/testify/enable/yaml/v2 v2.7.0 h1:wPW6YRgx3+SID1yUy/Xwa17L8kFEaEKod2VRbJDZNUs= +github.com/go-openapi/testify/enable/yaml/v2 v2.7.0/go.mod h1:mI1M88etYbc3PhgHsWQK2kwvNwW5aGFqMPbmib+SGIs= +github.com/go-openapi/testify/v2 v2.8.0 h1:19QDx5b57p8KjO2E4sgs/woL4Akp+FGLRlVm2xn0Rho= +github.com/go-openapi/testify/v2 v2.8.0/go.mod h1:4gUN8jC+RqOE2qjW/vDmfyTvl5BCht4qL7oca0odrak= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c= +github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= +github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4= +github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= +github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= +go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= +golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw= +golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= +golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= +golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= +golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= +golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE= +golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s= +golang.org/x/tools v0.51.0/go.mod h1:9eEncMayCV6zRMGhR5eZEC2iBx98qWcF1HZ9Z7wJOoA= +golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= +golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8= +google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= +google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo= +gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM= +k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= +k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= +k8s.io/kube-openapi v0.0.0-20261014044854-ca3452a79603 h1:9zl8YVFBvuURO1ZrSa1SFWyfbnzyll2ivV163KCkRs0= +k8s.io/kube-openapi v0.0.0-20261014044854-ca3452a79603/go.mod h1:ijAJHxCK/9OftZdcKwI5BHyIeRUeoKe1ldIyM4JHMts= +k8s.io/utils v0.0.0-20260626114624-be93311217bd h1:Ea7fgQ5we8Y9T0OX5o0dAHzQOBRI07D/dEYRaB9ZZEs= +k8s.io/utils v0.0.0-20260626114624-be93311217bd/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= +sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= +sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/structured-merge-diff/v7 v7.0.1 h1:mjAf8oNt6P6M9/uHoZLY2x/iQj/U5YFe0ke1VL/XjeY= +sigs.k8s.io/structured-merge-diff/v7 v7.0.1/go.mod h1:xKoMSgtnJnkfRR+CTNSQ1dBVhkKJR5OQl5RxX/OqHbI= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.pb.go b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.pb.go index cf9d745a9fd..0277fb6933c 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.pb.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.pb.go @@ -15,7 +15,7 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto +// source: k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.proto package v1 diff --git a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.proto b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.proto index fc47cf3d215..356b58fb8ea 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.proto +++ b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1/generated.proto @@ -19,14 +19,14 @@ limitations under the License. syntax = "proto2"; -package k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1; +package k8s.io.apiextensions_api.pkg.apis.apiextensions.v1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"; +option go_package = "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1"; // ConversionRequest describes the conversion request parameters. message ConversionRequest { diff --git a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.pb.go b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.pb.go index ef4fba85053..d8772ff3b65 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.pb.go @@ -15,7 +15,7 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto +// source: k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.proto package v1beta1 diff --git a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.proto b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.proto index 72089e51a29..02d593685eb 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1/generated.proto @@ -19,14 +19,14 @@ limitations under the License. syntax = "proto2"; -package k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1; +package k8s.io.apiextensions_api.pkg.apis.apiextensions.v1beta1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"; +option go_package = "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1"; // ConversionRequest describes the conversion request parameters. message ConversionRequest { diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourceconversion.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourceconversion.go index f2d1853366b..9018f8d1c6f 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourceconversion.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourceconversion.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // CustomResourceConversionApplyConfiguration represents a declarative configuration of the CustomResourceConversion type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinition.go index 0fd3d5369da..b546378c7e9 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinition.go @@ -19,8 +19,8 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - internal "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/internal" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + internal "k8s.io/apiextensions-api/pkg/client/applyconfiguration/internal" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitioncondition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitioncondition.go index 54f7d2d7b7d..172c6bb8a3c 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitioncondition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitioncondition.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - 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" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionspec.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionspec.go index b33a8241846..0ac7191d206 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionspec.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionspec.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // CustomResourceDefinitionSpecApplyConfiguration represents a declarative configuration of the CustomResourceDefinitionSpec type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresources.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresources.go index 77307d9af03..66cafa38c2a 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresources.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresources.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // CustomResourceSubresourcesApplyConfiguration represents a declarative configuration of the CustomResourceSubresources type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/jsonschemaprops.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/jsonschemaprops.go index 8441405281d..1ea2de4f6b4 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/jsonschemaprops.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/jsonschemaprops.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // JSONSchemaPropsApplyConfiguration represents a declarative configuration of the JSONSchemaProps type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/validationrule.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/validationrule.go index 4f2278bf220..b0f85d4dcf5 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/validationrule.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1/validationrule.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // ValidationRuleApplyConfiguration represents a declarative configuration of the ValidationRule type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourceconversion.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourceconversion.go index 8cc99f2eb15..4aaa5950f4f 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourceconversion.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourceconversion.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" ) // CustomResourceConversionApplyConfiguration represents a declarative configuration of the CustomResourceConversion type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinition.go index 818e76e3db6..b5e55f80f9c 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinition.go @@ -19,8 +19,8 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - internal "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/internal" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + internal "k8s.io/apiextensions-api/pkg/client/applyconfiguration/internal" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitioncondition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitioncondition.go index ce0577234ca..6a3a5e8316f 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitioncondition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitioncondition.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionspec.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionspec.go index 71b826a772c..d2b7c41dfd6 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionspec.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionspec.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" ) // CustomResourceDefinitionSpecApplyConfiguration represents a declarative configuration of the CustomResourceDefinitionSpec type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresources.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresources.go index 6b92eb1fcdd..26e77fc6cfd 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresources.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresources.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" ) // CustomResourceSubresourcesApplyConfiguration represents a declarative configuration of the CustomResourceSubresources type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/jsonschemaprops.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/jsonschemaprops.go index 4997d47e609..0895b3dbe11 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/jsonschemaprops.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/jsonschemaprops.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" ) // JSONSchemaPropsApplyConfiguration represents a declarative configuration of the JSONSchemaProps type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/validationrule.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/validationrule.go index 4e1c108fa0b..944b28348b4 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/validationrule.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1/validationrule.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" ) // ValidationRuleApplyConfiguration represents a declarative configuration of the ValidationRule type for use diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/utils.go b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/utils.go index 6a2dc7529d1..dfd4c0b37f1 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/utils.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/applyconfiguration/utils.go @@ -19,11 +19,11 @@ limitations under the License. package applyconfiguration import ( - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1" - internal "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/internal" + v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1" + internal "k8s.io/apiextensions-api/pkg/client/applyconfiguration/internal" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" managedfields "k8s.io/apimachinery/pkg/util/managedfields" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/clientset.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/clientset.go index 8e13f11bb74..e6c66285921 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/clientset.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/clientset.go @@ -22,8 +22,8 @@ import ( fmt "fmt" http "net/http" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/clientset_generated.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/clientset_generated.go index b76c1d10134..30fda7a2710 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/clientset_generated.go @@ -19,12 +19,12 @@ limitations under the License. package fake import ( - applyconfiguration "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration" - clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" - fakeapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/fake" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" - fakeapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake" + applyconfiguration "k8s.io/apiextensions-api/pkg/client/applyconfiguration" + clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1" + fakeapiextensionsv1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + fakeapiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/register.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/register.go index 355c699073f..459e4f3b96a 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/register.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/fake/register.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( - 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme/register.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme/register.go index b5c4fdc7897..91f4d8c1c27 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme/register.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme/register.go @@ -19,8 +19,8 @@ limitations under the License. package scheme import ( - 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/apiextensions_client.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/apiextensions_client.go index 9cd2165609b..f722379c63f 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/apiextensions_client.go @@ -21,8 +21,8 @@ package v1 import ( http "net/http" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + scheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go index 181943eea65..8ef70256a03 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go @@ -21,9 +21,9 @@ package v1 import ( context "context" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - applyconfigurationapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1" - scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + applyconfigurationapiextensionsv1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1" + scheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_apiextensions_client.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_apiextensions_client.go index e0e0048aa4f..1d01dae05ee 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_apiextensions_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" + v1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_customresourcedefinition.go index 0667ea907c8..9c526e4acae 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1/fake/fake_customresourcedefinition.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1" - typedapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" + v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1" + typedapiextensionsv1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go index 4556e25246c..ba61fe384a0 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go @@ -21,8 +21,8 @@ package v1beta1 import ( http "net/http" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + scheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go index 8a9a82c573a..818f64860c3 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go @@ -21,9 +21,9 @@ package v1beta1 import ( context "context" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - applyconfigurationapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1" - scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + applyconfigurationapiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1" + scheme "k8s.io/apiextensions-api/pkg/client/clientset/clientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go index 2cc0b5342c1..a16c711196c 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + v1beta1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go index 9fbe167b66a..f05d28ed6b9 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1" - typedapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/applyconfiguration/apiextensions/v1beta1" + typedapiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" gentype "k8s.io/client-go/gentype" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/interface.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/interface.go index dcb16e7814e..0bfef3bc6b6 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/interface.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/interface.go @@ -19,9 +19,9 @@ limitations under the License. package apiextensions import ( - v1 "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1" - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" + v1 "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1" + v1beta1 "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/customresourcedefinition.go index 51edb5b60ef..1f3bcf6cab6 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/customresourcedefinition.go @@ -22,10 +22,10 @@ import ( context "context" time "time" - apisapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1" + apisapiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/interface.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/interface.go index 464873a68b4..9e38b40842c 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/interface.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go index 49909de6e19..27025d11ce3 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go @@ -22,10 +22,10 @@ import ( context "context" time "time" - apisapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1" + apisapiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" + clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go index 918e9ab5c41..d2805e392e6 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/factory.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/factory.go index be3e88b0be7..e21e2790270 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/factory.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/factory.go @@ -24,9 +24,9 @@ import ( sync "sync" time "time" - clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - apiextensions "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions" - internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" + clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset" + apiextensions "k8s.io/apiextensions-api/pkg/client/informers/externalversions/apiextensions" + internalinterfaces "k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/generic.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/generic.go index 6f0fda786be..62663bff108 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/generic.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/generic.go @@ -21,8 +21,8 @@ package externalversions import ( fmt "fmt" - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 4c60257a41f..c9c04992ac0 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + clientset "k8s.io/apiextensions-api/pkg/client/clientset/clientset" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1/customresourcedefinition.go index 37298a9b7e5..2f5ac409645 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1/customresourcedefinition.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go index 61a3c8e2a76..b8429a89255 100644 --- a/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-api/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 58b4cf19276..4e0bfed99f1 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -8,7 +8,6 @@ godebug default=go1.27 require ( github.com/emicklei/go-restful/v3 v3.14.0 - github.com/fxamacker/cbor/v2 v2.9.4 github.com/google/cel-go v0.29.2 github.com/google/gnostic-models v0.7.1 github.com/google/go-cmp v0.7.0 @@ -26,6 +25,7 @@ require ( google.golang.org/protobuf v1.36.12 gopkg.in/evanphx/json-patch.v4 v4.13.0 k8s.io/api v0.0.0 + k8s.io/apiextensions-api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/apiserver v0.0.0 k8s.io/client-go v0.0.0 @@ -53,6 +53,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/fxamacker/cbor/v2 v2.9.4 // indirect github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v1.0.2 // indirect @@ -122,6 +123,7 @@ require ( replace ( k8s.io/api => ../api + k8s.io/apiextensions-api => ../apiextensions-api k8s.io/apimachinery => ../apimachinery k8s.io/apiserver => ../apiserver k8s.io/client-go => ../client-go diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/zz_generated.conversion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/zz_generated.conversion.go index 29639388da1..4345b9c5e69 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/zz_generated.conversion.go @@ -24,6 +24,7 @@ package v1 import ( unsafe "unsafe" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" @@ -37,278 +38,278 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*CustomResourceColumnDefinition)(nil), (*apiextensions.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(a.(*CustomResourceColumnDefinition), b.(*apiextensions.CustomResourceColumnDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceColumnDefinition)(nil), (*apiextensions.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(a.(*apiextensionsv1.CustomResourceColumnDefinition), b.(*apiextensions.CustomResourceColumnDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceColumnDefinition)(nil), (*CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(a.(*apiextensions.CustomResourceColumnDefinition), b.(*CustomResourceColumnDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceColumnDefinition)(nil), (*apiextensionsv1.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(a.(*apiextensions.CustomResourceColumnDefinition), b.(*apiextensionsv1.CustomResourceColumnDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinition)(nil), (*apiextensions.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(a.(*CustomResourceDefinition), b.(*apiextensions.CustomResourceDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinition)(nil), (*apiextensions.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(a.(*apiextensionsv1.CustomResourceDefinition), b.(*apiextensions.CustomResourceDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinition)(nil), (*CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(a.(*apiextensions.CustomResourceDefinition), b.(*CustomResourceDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinition)(nil), (*apiextensionsv1.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(a.(*apiextensions.CustomResourceDefinition), b.(*apiextensionsv1.CustomResourceDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionCondition)(nil), (*apiextensions.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(a.(*CustomResourceDefinitionCondition), b.(*apiextensions.CustomResourceDefinitionCondition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinitionCondition)(nil), (*apiextensions.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(a.(*apiextensionsv1.CustomResourceDefinitionCondition), b.(*apiextensions.CustomResourceDefinitionCondition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionCondition)(nil), (*CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(a.(*apiextensions.CustomResourceDefinitionCondition), b.(*CustomResourceDefinitionCondition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionCondition)(nil), (*apiextensionsv1.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(a.(*apiextensions.CustomResourceDefinitionCondition), b.(*apiextensionsv1.CustomResourceDefinitionCondition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionList)(nil), (*apiextensions.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(a.(*CustomResourceDefinitionList), b.(*apiextensions.CustomResourceDefinitionList), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinitionList)(nil), (*apiextensions.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(a.(*apiextensionsv1.CustomResourceDefinitionList), b.(*apiextensions.CustomResourceDefinitionList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionList)(nil), (*CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(a.(*apiextensions.CustomResourceDefinitionList), b.(*CustomResourceDefinitionList), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionList)(nil), (*apiextensionsv1.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(a.(*apiextensions.CustomResourceDefinitionList), b.(*apiextensionsv1.CustomResourceDefinitionList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionNames)(nil), (*apiextensions.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(a.(*CustomResourceDefinitionNames), b.(*apiextensions.CustomResourceDefinitionNames), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinitionNames)(nil), (*apiextensions.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(a.(*apiextensionsv1.CustomResourceDefinitionNames), b.(*apiextensions.CustomResourceDefinitionNames), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionNames)(nil), (*CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(a.(*apiextensions.CustomResourceDefinitionNames), b.(*CustomResourceDefinitionNames), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionNames)(nil), (*apiextensionsv1.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(a.(*apiextensions.CustomResourceDefinitionNames), b.(*apiextensionsv1.CustomResourceDefinitionNames), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionStatus)(nil), (*apiextensions.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(a.(*CustomResourceDefinitionStatus), b.(*apiextensions.CustomResourceDefinitionStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinitionStatus)(nil), (*apiextensions.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(a.(*apiextensionsv1.CustomResourceDefinitionStatus), b.(*apiextensions.CustomResourceDefinitionStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionStatus)(nil), (*CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(a.(*apiextensions.CustomResourceDefinitionStatus), b.(*CustomResourceDefinitionStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionStatus)(nil), (*apiextensionsv1.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(a.(*apiextensions.CustomResourceDefinitionStatus), b.(*apiextensionsv1.CustomResourceDefinitionStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionVersion)(nil), (*apiextensions.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(a.(*CustomResourceDefinitionVersion), b.(*apiextensions.CustomResourceDefinitionVersion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceDefinitionVersion)(nil), (*apiextensions.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(a.(*apiextensionsv1.CustomResourceDefinitionVersion), b.(*apiextensions.CustomResourceDefinitionVersion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionVersion)(nil), (*CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(a.(*apiextensions.CustomResourceDefinitionVersion), b.(*CustomResourceDefinitionVersion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionVersion)(nil), (*apiextensionsv1.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(a.(*apiextensions.CustomResourceDefinitionVersion), b.(*apiextensionsv1.CustomResourceDefinitionVersion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresourceScale)(nil), (*apiextensions.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(a.(*CustomResourceSubresourceScale), b.(*apiextensions.CustomResourceSubresourceScale), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceSubresourceScale)(nil), (*apiextensions.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(a.(*apiextensionsv1.CustomResourceSubresourceScale), b.(*apiextensions.CustomResourceSubresourceScale), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceScale)(nil), (*CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(a.(*apiextensions.CustomResourceSubresourceScale), b.(*CustomResourceSubresourceScale), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceScale)(nil), (*apiextensionsv1.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(a.(*apiextensions.CustomResourceSubresourceScale), b.(*apiextensionsv1.CustomResourceSubresourceScale), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresourceStatus)(nil), (*apiextensions.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(a.(*CustomResourceSubresourceStatus), b.(*apiextensions.CustomResourceSubresourceStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceSubresourceStatus)(nil), (*apiextensions.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(a.(*apiextensionsv1.CustomResourceSubresourceStatus), b.(*apiextensions.CustomResourceSubresourceStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceStatus)(nil), (*CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(a.(*apiextensions.CustomResourceSubresourceStatus), b.(*CustomResourceSubresourceStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceStatus)(nil), (*apiextensionsv1.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(a.(*apiextensions.CustomResourceSubresourceStatus), b.(*apiextensionsv1.CustomResourceSubresourceStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresources)(nil), (*apiextensions.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(a.(*CustomResourceSubresources), b.(*apiextensions.CustomResourceSubresources), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceSubresources)(nil), (*apiextensions.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(a.(*apiextensionsv1.CustomResourceSubresources), b.(*apiextensions.CustomResourceSubresources), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresources)(nil), (*CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(a.(*apiextensions.CustomResourceSubresources), b.(*CustomResourceSubresources), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresources)(nil), (*apiextensionsv1.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(a.(*apiextensions.CustomResourceSubresources), b.(*apiextensionsv1.CustomResourceSubresources), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceValidation)(nil), (*apiextensions.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(a.(*CustomResourceValidation), b.(*apiextensions.CustomResourceValidation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.CustomResourceValidation)(nil), (*apiextensions.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(a.(*apiextensionsv1.CustomResourceValidation), b.(*apiextensions.CustomResourceValidation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceValidation)(nil), (*CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(a.(*apiextensions.CustomResourceValidation), b.(*CustomResourceValidation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceValidation)(nil), (*apiextensionsv1.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(a.(*apiextensions.CustomResourceValidation), b.(*apiextensionsv1.CustomResourceValidation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ExternalDocumentation)(nil), (*apiextensions.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(a.(*ExternalDocumentation), b.(*apiextensions.ExternalDocumentation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.ExternalDocumentation)(nil), (*apiextensions.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(a.(*apiextensionsv1.ExternalDocumentation), b.(*apiextensions.ExternalDocumentation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ExternalDocumentation)(nil), (*ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(a.(*apiextensions.ExternalDocumentation), b.(*ExternalDocumentation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ExternalDocumentation)(nil), (*apiextensionsv1.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(a.(*apiextensions.ExternalDocumentation), b.(*apiextensionsv1.ExternalDocumentation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaProps)(nil), (*apiextensions.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(a.(*JSONSchemaProps), b.(*apiextensions.JSONSchemaProps), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.JSONSchemaProps)(nil), (*apiextensions.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(a.(*apiextensionsv1.JSONSchemaProps), b.(*apiextensions.JSONSchemaProps), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrArray)(nil), (*apiextensions.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(a.(*JSONSchemaPropsOrArray), b.(*apiextensions.JSONSchemaPropsOrArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.JSONSchemaPropsOrArray)(nil), (*apiextensions.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(a.(*apiextensionsv1.JSONSchemaPropsOrArray), b.(*apiextensions.JSONSchemaPropsOrArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrArray)(nil), (*JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(a.(*apiextensions.JSONSchemaPropsOrArray), b.(*JSONSchemaPropsOrArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrArray)(nil), (*apiextensionsv1.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(a.(*apiextensions.JSONSchemaPropsOrArray), b.(*apiextensionsv1.JSONSchemaPropsOrArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrBool)(nil), (*apiextensions.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(a.(*JSONSchemaPropsOrBool), b.(*apiextensions.JSONSchemaPropsOrBool), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.JSONSchemaPropsOrBool)(nil), (*apiextensions.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(a.(*apiextensionsv1.JSONSchemaPropsOrBool), b.(*apiextensions.JSONSchemaPropsOrBool), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrBool)(nil), (*JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(a.(*apiextensions.JSONSchemaPropsOrBool), b.(*JSONSchemaPropsOrBool), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrBool)(nil), (*apiextensionsv1.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(a.(*apiextensions.JSONSchemaPropsOrBool), b.(*apiextensionsv1.JSONSchemaPropsOrBool), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrStringArray)(nil), (*apiextensions.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(a.(*JSONSchemaPropsOrStringArray), b.(*apiextensions.JSONSchemaPropsOrStringArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.JSONSchemaPropsOrStringArray)(nil), (*apiextensions.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(a.(*apiextensionsv1.JSONSchemaPropsOrStringArray), b.(*apiextensions.JSONSchemaPropsOrStringArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrStringArray)(nil), (*JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(a.(*apiextensions.JSONSchemaPropsOrStringArray), b.(*JSONSchemaPropsOrStringArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrStringArray)(nil), (*apiextensionsv1.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(a.(*apiextensions.JSONSchemaPropsOrStringArray), b.(*apiextensionsv1.JSONSchemaPropsOrStringArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SelectableField)(nil), (*apiextensions.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_SelectableField_To_apiextensions_SelectableField(a.(*SelectableField), b.(*apiextensions.SelectableField), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.SelectableField)(nil), (*apiextensions.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_SelectableField_To_apiextensions_SelectableField(a.(*apiextensionsv1.SelectableField), b.(*apiextensions.SelectableField), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.SelectableField)(nil), (*SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_SelectableField_To_v1_SelectableField(a.(*apiextensions.SelectableField), b.(*SelectableField), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.SelectableField)(nil), (*apiextensionsv1.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_SelectableField_To_v1_SelectableField(a.(*apiextensions.SelectableField), b.(*apiextensionsv1.SelectableField), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ServiceReference)(nil), (*apiextensions.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_ServiceReference_To_apiextensions_ServiceReference(a.(*ServiceReference), b.(*apiextensions.ServiceReference), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.ServiceReference)(nil), (*apiextensions.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_ServiceReference_To_apiextensions_ServiceReference(a.(*apiextensionsv1.ServiceReference), b.(*apiextensions.ServiceReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ServiceReference)(nil), (*ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ServiceReference_To_v1_ServiceReference(a.(*apiextensions.ServiceReference), b.(*ServiceReference), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ServiceReference)(nil), (*apiextensionsv1.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ServiceReference_To_v1_ServiceReference(a.(*apiextensions.ServiceReference), b.(*apiextensionsv1.ServiceReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ValidationRule)(nil), (*apiextensions.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_ValidationRule_To_apiextensions_ValidationRule(a.(*ValidationRule), b.(*apiextensions.ValidationRule), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.ValidationRule)(nil), (*apiextensions.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_ValidationRule_To_apiextensions_ValidationRule(a.(*apiextensionsv1.ValidationRule), b.(*apiextensions.ValidationRule), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ValidationRule)(nil), (*ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ValidationRule_To_v1_ValidationRule(a.(*apiextensions.ValidationRule), b.(*ValidationRule), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ValidationRule)(nil), (*apiextensionsv1.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ValidationRule_To_v1_ValidationRule(a.(*apiextensions.ValidationRule), b.(*apiextensionsv1.ValidationRule), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*WebhookClientConfig)(nil), (*apiextensions.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(a.(*WebhookClientConfig), b.(*apiextensions.WebhookClientConfig), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1.WebhookClientConfig)(nil), (*apiextensions.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(a.(*apiextensionsv1.WebhookClientConfig), b.(*apiextensions.WebhookClientConfig), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.WebhookClientConfig)(nil), (*WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(a.(*apiextensions.WebhookClientConfig), b.(*WebhookClientConfig), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.WebhookClientConfig)(nil), (*apiextensionsv1.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(a.(*apiextensions.WebhookClientConfig), b.(*apiextensionsv1.WebhookClientConfig), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.CustomResourceConversion)(nil), (*CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(a.(*apiextensions.CustomResourceConversion), b.(*CustomResourceConversion), scope) + if err := s.AddConversionFunc((*apiextensions.CustomResourceConversion)(nil), (*apiextensionsv1.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(a.(*apiextensions.CustomResourceConversion), b.(*apiextensionsv1.CustomResourceConversion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.CustomResourceDefinitionSpec)(nil), (*CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(a.(*apiextensions.CustomResourceDefinitionSpec), b.(*CustomResourceDefinitionSpec), scope) + if err := s.AddConversionFunc((*apiextensions.CustomResourceDefinitionSpec)(nil), (*apiextensionsv1.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(a.(*apiextensions.CustomResourceDefinitionSpec), b.(*apiextensionsv1.CustomResourceDefinitionSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.JSONSchemaProps)(nil), (*JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(a.(*apiextensions.JSONSchemaProps), b.(*JSONSchemaProps), scope) + if err := s.AddConversionFunc((*apiextensions.JSONSchemaProps)(nil), (*apiextensionsv1.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(a.(*apiextensions.JSONSchemaProps), b.(*apiextensionsv1.JSONSchemaProps), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.JSON)(nil), (*JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSON_To_v1_JSON(a.(*apiextensions.JSON), b.(*JSON), scope) + if err := s.AddConversionFunc((*apiextensions.JSON)(nil), (*apiextensionsv1.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSON_To_v1_JSON(a.(*apiextensions.JSON), b.(*apiextensionsv1.JSON), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.ValidationRules)(nil), (*ValidationRules)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ValidationRules_To_v1_ValidationRules(a.(*apiextensions.ValidationRules), b.(*ValidationRules), scope) + if err := s.AddConversionFunc((*apiextensions.ValidationRules)(nil), (*apiextensionsv1.ValidationRules)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ValidationRules_To_v1_ValidationRules(a.(*apiextensions.ValidationRules), b.(*apiextensionsv1.ValidationRules), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*CustomResourceConversion)(nil), (*apiextensions.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(a.(*CustomResourceConversion), b.(*apiextensions.CustomResourceConversion), scope) + if err := s.AddConversionFunc((*apiextensionsv1.CustomResourceConversion)(nil), (*apiextensions.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(a.(*apiextensionsv1.CustomResourceConversion), b.(*apiextensions.CustomResourceConversion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*CustomResourceDefinitionSpec)(nil), (*apiextensions.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(a.(*CustomResourceDefinitionSpec), b.(*apiextensions.CustomResourceDefinitionSpec), scope) + if err := s.AddConversionFunc((*apiextensionsv1.CustomResourceDefinitionSpec)(nil), (*apiextensions.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(a.(*apiextensionsv1.CustomResourceDefinitionSpec), b.(*apiextensions.CustomResourceDefinitionSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*JSON)(nil), (*apiextensions.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_JSON_To_apiextensions_JSON(a.(*JSON), b.(*apiextensions.JSON), scope) + if err := s.AddConversionFunc((*apiextensionsv1.JSON)(nil), (*apiextensions.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_JSON_To_apiextensions_JSON(a.(*apiextensionsv1.JSON), b.(*apiextensions.JSON), scope) }); err != nil { return err } return nil } -func autoConvert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { +func autoConvert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *apiextensionsv1.CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceColumnDefinition)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition is an autogenerated conversion function. -func Convert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { +func Convert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *apiextensionsv1.CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { return autoConvert_v1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in, out, s) } -func autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *CustomResourceColumnDefinition, s conversion.Scope) error { - *out = *(*CustomResourceColumnDefinition)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *apiextensionsv1.CustomResourceColumnDefinition, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceColumnDefinition)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *CustomResourceColumnDefinition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *apiextensionsv1.CustomResourceColumnDefinition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1_CustomResourceColumnDefinition(in, out, s) } -func autoConvert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { +func autoConvert_v1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *apiextensionsv1.CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { out.Strategy = apiextensions.ConversionStrategyType(in.Strategy) // WARNING: in.Webhook requires manual conversion: does not exist in peer-type return nil } -func autoConvert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *CustomResourceConversion, s conversion.Scope) error { - out.Strategy = ConversionStrategyType(in.Strategy) +func autoConvert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *apiextensionsv1.CustomResourceConversion, s conversion.Scope) error { + out.Strategy = apiextensionsv1.ConversionStrategyType(in.Strategy) // WARNING: in.WebhookClientConfig requires manual conversion: does not exist in peer-type // WARNING: in.ConversionReviewVersions requires manual conversion: does not exist in peer-type return nil } -func autoConvert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *apiextensionsv1.CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { return err @@ -320,11 +321,11 @@ func autoConvert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefi } // Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *apiextensionsv1.CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *apiextensionsv1.CustomResourceDefinition, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { return err @@ -336,31 +337,31 @@ func autoConvert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefi } // Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *apiextensionsv1.CustomResourceDefinition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(in, out, s) } -func autoConvert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *apiextensionsv1.CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionCondition)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *apiextensionsv1.CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionCondition)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *apiextensionsv1.CustomResourceDefinitionCondition, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceDefinitionCondition)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *apiextensionsv1.CustomResourceDefinitionCondition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1_CustomResourceDefinitionCondition(in, out, s) } -func autoConvert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *apiextensionsv1.CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items @@ -377,15 +378,15 @@ func autoConvert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResource } // Convert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *apiextensionsv1.CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *apiextensionsv1.CustomResourceDefinitionList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]CustomResourceDefinition, len(*in)) + *out = make([]apiextensionsv1.CustomResourceDefinition, len(*in)) for i := range *in { if err := Convert_apiextensions_CustomResourceDefinition_To_v1_CustomResourceDefinition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -398,31 +399,31 @@ func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResource } // Convert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *apiextensionsv1.CustomResourceDefinitionList, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionList_To_v1_CustomResourceDefinitionList(in, out, s) } -func autoConvert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *apiextensionsv1.CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionNames)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *apiextensionsv1.CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionNames)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *apiextensionsv1.CustomResourceDefinitionNames, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceDefinitionNames)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *apiextensionsv1.CustomResourceDefinitionNames, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(in, out, s) } -func autoConvert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *apiextensionsv1.CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { out.Group = in.Group if err := Convert_v1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { return err @@ -454,18 +455,18 @@ func autoConvert_v1_CustomResourceDefinitionSpec_To_apiextensions_CustomResource return nil } -func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *apiextensionsv1.CustomResourceDefinitionSpec, s conversion.Scope) error { out.Group = in.Group // WARNING: in.Version requires manual conversion: does not exist in peer-type if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { return err } - out.Scope = ResourceScope(in.Scope) + out.Scope = apiextensionsv1.ResourceScope(in.Scope) // WARNING: in.Validation requires manual conversion: does not exist in peer-type // WARNING: in.Subresources requires manual conversion: does not exist in peer-type if in.Versions != nil { in, out := &in.Versions, &out.Versions - *out = make([]CustomResourceDefinitionVersion, len(*in)) + *out = make([]apiextensionsv1.CustomResourceDefinitionVersion, len(*in)) for i := range *in { if err := Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -478,7 +479,7 @@ func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResource // WARNING: in.SelectableFields requires manual conversion: does not exist in peer-type if in.Conversion != nil { in, out := &in.Conversion, &out.Conversion - *out = new(CustomResourceConversion) + *out = new(apiextensionsv1.CustomResourceConversion) if err := Convert_apiextensions_CustomResourceConversion_To_v1_CustomResourceConversion(*in, *out, s); err != nil { return err } @@ -491,27 +492,27 @@ func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1_CustomResource return nil } -func autoConvert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *apiextensionsv1.CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionStatus)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *apiextensionsv1.CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionStatus)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *apiextensionsv1.CustomResourceDefinitionStatus, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceDefinitionStatus)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *apiextensionsv1.CustomResourceDefinitionStatus, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1_CustomResourceDefinitionStatus(in, out, s) } -func autoConvert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { +func autoConvert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *apiextensionsv1.CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { out.Name = in.Name out.Served = in.Served out.Storage = in.Storage @@ -533,11 +534,11 @@ func autoConvert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResou } // Convert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion is an autogenerated conversion function. -func Convert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { +func Convert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *apiextensionsv1.CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { return autoConvert_v1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *CustomResourceDefinitionVersion, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *apiextensionsv1.CustomResourceDefinitionVersion, s conversion.Scope) error { out.Name = in.Name out.Served = in.Served out.Storage = in.Storage @@ -545,85 +546,85 @@ func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResou out.DeprecationWarning = (*string)(unsafe.Pointer(in.DeprecationWarning)) if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(CustomResourceValidation) + *out = new(apiextensionsv1.CustomResourceValidation) if err := Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(*in, *out, s); err != nil { return err } } else { out.Schema = nil } - out.Subresources = (*CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) - out.AdditionalPrinterColumns = *(*[]CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) - out.SelectableFields = *(*[]SelectableField)(unsafe.Pointer(&in.SelectableFields)) + out.Subresources = (*apiextensionsv1.CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) + out.AdditionalPrinterColumns = *(*[]apiextensionsv1.CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) + out.SelectableFields = *(*[]apiextensionsv1.SelectableField)(unsafe.Pointer(&in.SelectableFields)) return nil } // Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *CustomResourceDefinitionVersion, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *apiextensionsv1.CustomResourceDefinitionVersion, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1_CustomResourceDefinitionVersion(in, out, s) } -func autoConvert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { +func autoConvert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *apiextensionsv1.CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresourceScale)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale is an autogenerated conversion function. -func Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { +func Convert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *apiextensionsv1.CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { return autoConvert_v1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *CustomResourceSubresourceScale, s conversion.Scope) error { - *out = *(*CustomResourceSubresourceScale)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *apiextensionsv1.CustomResourceSubresourceScale, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceSubresourceScale)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *CustomResourceSubresourceScale, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *apiextensionsv1.CustomResourceSubresourceScale, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1_CustomResourceSubresourceScale(in, out, s) } -func autoConvert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { +func autoConvert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *apiextensionsv1.CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresourceStatus)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus is an autogenerated conversion function. -func Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { +func Convert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *apiextensionsv1.CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { return autoConvert_v1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *CustomResourceSubresourceStatus, s conversion.Scope) error { - *out = *(*CustomResourceSubresourceStatus)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *apiextensionsv1.CustomResourceSubresourceStatus, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceSubresourceStatus)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *CustomResourceSubresourceStatus, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *apiextensionsv1.CustomResourceSubresourceStatus, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1_CustomResourceSubresourceStatus(in, out, s) } -func autoConvert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { +func autoConvert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *apiextensionsv1.CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresources)(unsafe.Pointer(in)) return nil } // Convert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources is an autogenerated conversion function. -func Convert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { +func Convert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *apiextensionsv1.CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { return autoConvert_v1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *CustomResourceSubresources, s conversion.Scope) error { - *out = *(*CustomResourceSubresources)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *apiextensionsv1.CustomResourceSubresources, s conversion.Scope) error { + *out = *(*apiextensionsv1.CustomResourceSubresources)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *CustomResourceSubresources, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *apiextensionsv1.CustomResourceSubresources, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresources_To_v1_CustomResourceSubresources(in, out, s) } -func autoConvert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { +func autoConvert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *apiextensionsv1.CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { if in.OpenAPIV3Schema != nil { in, out := &in.OpenAPIV3Schema, &out.OpenAPIV3Schema *out = new(apiextensions.JSONSchemaProps) @@ -637,14 +638,14 @@ func autoConvert_v1_CustomResourceValidation_To_apiextensions_CustomResourceVali } // Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation is an autogenerated conversion function. -func Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { +func Convert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *apiextensionsv1.CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { return autoConvert_v1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in, out, s) } -func autoConvert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *CustomResourceValidation, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *apiextensionsv1.CustomResourceValidation, s conversion.Scope) error { if in.OpenAPIV3Schema != nil { in, out := &in.OpenAPIV3Schema, &out.OpenAPIV3Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -655,41 +656,41 @@ func autoConvert_apiextensions_CustomResourceValidation_To_v1_CustomResourceVali } // Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *CustomResourceValidation, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *apiextensionsv1.CustomResourceValidation, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceValidation_To_v1_CustomResourceValidation(in, out, s) } -func autoConvert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { +func autoConvert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *apiextensionsv1.ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { *out = *(*apiextensions.ExternalDocumentation)(unsafe.Pointer(in)) return nil } // Convert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation is an autogenerated conversion function. -func Convert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { +func Convert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *apiextensionsv1.ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { return autoConvert_v1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in, out, s) } -func autoConvert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *ExternalDocumentation, s conversion.Scope) error { - *out = *(*ExternalDocumentation)(unsafe.Pointer(in)) +func autoConvert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *apiextensionsv1.ExternalDocumentation, s conversion.Scope) error { + *out = *(*apiextensionsv1.ExternalDocumentation)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation is an autogenerated conversion function. -func Convert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *ExternalDocumentation, s conversion.Scope) error { +func Convert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *apiextensionsv1.ExternalDocumentation, s conversion.Scope) error { return autoConvert_apiextensions_ExternalDocumentation_To_v1_ExternalDocumentation(in, out, s) } -func autoConvert_v1_JSON_To_apiextensions_JSON(in *JSON, out *apiextensions.JSON, s conversion.Scope) error { +func autoConvert_v1_JSON_To_apiextensions_JSON(in *apiextensionsv1.JSON, out *apiextensions.JSON, s conversion.Scope) error { // WARNING: in.Raw requires manual conversion: does not exist in peer-type return nil } -func autoConvert_apiextensions_JSON_To_v1_JSON(in *apiextensions.JSON, out *JSON, s conversion.Scope) error { +func autoConvert_apiextensions_JSON_To_v1_JSON(in *apiextensions.JSON, out *apiextensionsv1.JSON, s conversion.Scope) error { // FIXME: Type apiextensions.JSON is unsupported. return nil } -func autoConvert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { +func autoConvert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *apiextensionsv1.JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { out.ID = in.ID out.Schema = apiextensions.JSONSchemaURL(in.Schema) out.Ref = (*string)(unsafe.Pointer(in.Ref)) @@ -874,13 +875,13 @@ func autoConvert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JSONSch } // Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps is an autogenerated conversion function. -func Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { +func Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *apiextensionsv1.JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { return autoConvert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in, out, s) } -func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *apiextensionsv1.JSONSchemaProps, s conversion.Scope) error { out.ID = in.ID - out.Schema = JSONSchemaURL(in.Schema) + out.Schema = apiextensionsv1.JSONSchemaURL(in.Schema) out.Ref = (*string)(unsafe.Pointer(in.Ref)) out.Description = in.Description out.Type = in.Type @@ -889,7 +890,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte out.Title = in.Title if in.Default != nil { in, out := &in.Default, &out.Default - *out = new(JSON) + *out = new(apiextensionsv1.JSON) if err := Convert_apiextensions_JSON_To_v1_JSON(*in, *out, s); err != nil { return err } @@ -909,7 +910,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte out.MultipleOf = (*float64)(unsafe.Pointer(in.MultipleOf)) if in.Enum != nil { in, out := &in.Enum, &out.Enum - *out = make([]JSON, len(*in)) + *out = make([]apiextensionsv1.JSON, len(*in)) for i := range *in { if err := Convert_apiextensions_JSON_To_v1_JSON(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -923,7 +924,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte out.Required = *(*[]string)(unsafe.Pointer(&in.Required)) if in.Items != nil { in, out := &in.Items, &out.Items - *out = new(JSONSchemaPropsOrArray) + *out = new(apiextensionsv1.JSONSchemaPropsOrArray) if err := Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(*in, *out, s); err != nil { return err } @@ -932,7 +933,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.AllOf != nil { in, out := &in.AllOf, &out.AllOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -943,7 +944,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.OneOf != nil { in, out := &in.OneOf, &out.OneOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -954,7 +955,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.AnyOf != nil { in, out := &in.AnyOf, &out.AnyOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -965,7 +966,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.Not != nil { in, out := &in.Not, &out.Not - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -974,9 +975,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.Properties != nil { in, out := &in.Properties, &out.Properties - *out = make(map[string]JSONSchemaProps, len(*in)) + *out = make(map[string]apiextensionsv1.JSONSchemaProps, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -987,7 +988,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.AdditionalProperties != nil { in, out := &in.AdditionalProperties, &out.AdditionalProperties - *out = new(JSONSchemaPropsOrBool) + *out = new(apiextensionsv1.JSONSchemaPropsOrBool) if err := Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(*in, *out, s); err != nil { return err } @@ -996,9 +997,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.PatternProperties != nil { in, out := &in.PatternProperties, &out.PatternProperties - *out = make(map[string]JSONSchemaProps, len(*in)) + *out = make(map[string]apiextensionsv1.JSONSchemaProps, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -1009,9 +1010,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.Dependencies != nil { in, out := &in.Dependencies, &out.Dependencies - *out = make(JSONSchemaDependencies, len(*in)) + *out = make(apiextensionsv1.JSONSchemaDependencies, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaPropsOrStringArray) + newVal := new(apiextensionsv1.JSONSchemaPropsOrStringArray) if err := Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(&val, newVal, s); err != nil { return err } @@ -1022,7 +1023,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.AdditionalItems != nil { in, out := &in.AdditionalItems, &out.AdditionalItems - *out = new(JSONSchemaPropsOrBool) + *out = new(apiextensionsv1.JSONSchemaPropsOrBool) if err := Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(*in, *out, s); err != nil { return err } @@ -1031,9 +1032,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } if in.Definitions != nil { in, out := &in.Definitions, &out.Definitions - *out = make(JSONSchemaDefinitions, len(*in)) + *out = make(apiextensionsv1.JSONSchemaDefinitions, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -1042,10 +1043,10 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte } else { out.Definitions = nil } - out.ExternalDocs = (*ExternalDocumentation)(unsafe.Pointer(in.ExternalDocs)) + out.ExternalDocs = (*apiextensionsv1.ExternalDocumentation)(unsafe.Pointer(in.ExternalDocs)) if in.Example != nil { in, out := &in.Example, &out.Example - *out = new(JSON) + *out = new(apiextensionsv1.JSON) if err := Convert_apiextensions_JSON_To_v1_JSON(*in, *out, s); err != nil { return err } @@ -1058,11 +1059,11 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiexte out.XListMapKeys = *(*[]string)(unsafe.Pointer(&in.XListMapKeys)) out.XListType = (*string)(unsafe.Pointer(in.XListType)) out.XMapType = (*string)(unsafe.Pointer(in.XMapType)) - out.XValidations = *(*ValidationRules)(unsafe.Pointer(&in.XValidations)) + out.XValidations = *(*apiextensionsv1.ValidationRules)(unsafe.Pointer(&in.XValidations)) return nil } -func autoConvert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { +func autoConvert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *apiextensionsv1.JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema *out = new(apiextensions.JSONSchemaProps) @@ -1087,14 +1088,14 @@ func autoConvert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArr } // Convert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray is an autogenerated conversion function. -func Convert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { +func Convert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *apiextensionsv1.JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { return autoConvert_v1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *JSONSchemaPropsOrArray, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *apiextensionsv1.JSONSchemaPropsOrArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1103,7 +1104,7 @@ func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArr } if in.JSONSchemas != nil { in, out := &in.JSONSchemas, &out.JSONSchemas - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -1116,11 +1117,11 @@ func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArr } // Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *JSONSchemaPropsOrArray, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *apiextensionsv1.JSONSchemaPropsOrArray, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1_JSONSchemaPropsOrArray(in, out, s) } -func autoConvert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { +func autoConvert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *apiextensionsv1.JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { out.Allows = in.Allows if in.Schema != nil { in, out := &in.Schema, &out.Schema @@ -1135,15 +1136,15 @@ func autoConvert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool } // Convert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool is an autogenerated conversion function. -func Convert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { +func Convert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *apiextensionsv1.JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { return autoConvert_v1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *JSONSchemaPropsOrBool, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *apiextensionsv1.JSONSchemaPropsOrBool, s conversion.Scope) error { out.Allows = in.Allows if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1154,11 +1155,11 @@ func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool } // Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *JSONSchemaPropsOrBool, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *apiextensionsv1.JSONSchemaPropsOrBool, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1_JSONSchemaPropsOrBool(in, out, s) } -func autoConvert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func autoConvert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *apiextensionsv1.JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema *out = new(apiextensions.JSONSchemaProps) @@ -1173,14 +1174,14 @@ func autoConvert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaProp } // Convert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray is an autogenerated conversion function. -func Convert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func Convert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *apiextensionsv1.JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { return autoConvert_v1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *apiextensionsv1.JSONSchemaPropsOrStringArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1192,31 +1193,31 @@ func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaProp } // Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *apiextensionsv1.JSONSchemaPropsOrStringArray, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1_JSONSchemaPropsOrStringArray(in, out, s) } -func autoConvert_v1_SelectableField_To_apiextensions_SelectableField(in *SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { +func autoConvert_v1_SelectableField_To_apiextensions_SelectableField(in *apiextensionsv1.SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { *out = *(*apiextensions.SelectableField)(unsafe.Pointer(in)) return nil } // Convert_v1_SelectableField_To_apiextensions_SelectableField is an autogenerated conversion function. -func Convert_v1_SelectableField_To_apiextensions_SelectableField(in *SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { +func Convert_v1_SelectableField_To_apiextensions_SelectableField(in *apiextensionsv1.SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { return autoConvert_v1_SelectableField_To_apiextensions_SelectableField(in, out, s) } -func autoConvert_apiextensions_SelectableField_To_v1_SelectableField(in *apiextensions.SelectableField, out *SelectableField, s conversion.Scope) error { - *out = *(*SelectableField)(unsafe.Pointer(in)) +func autoConvert_apiextensions_SelectableField_To_v1_SelectableField(in *apiextensions.SelectableField, out *apiextensionsv1.SelectableField, s conversion.Scope) error { + *out = *(*apiextensionsv1.SelectableField)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_SelectableField_To_v1_SelectableField is an autogenerated conversion function. -func Convert_apiextensions_SelectableField_To_v1_SelectableField(in *apiextensions.SelectableField, out *SelectableField, s conversion.Scope) error { +func Convert_apiextensions_SelectableField_To_v1_SelectableField(in *apiextensions.SelectableField, out *apiextensionsv1.SelectableField, s conversion.Scope) error { return autoConvert_apiextensions_SelectableField_To_v1_SelectableField(in, out, s) } -func autoConvert_v1_ServiceReference_To_apiextensions_ServiceReference(in *ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { +func autoConvert_v1_ServiceReference_To_apiextensions_ServiceReference(in *apiextensionsv1.ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.Name out.Path = (*string)(unsafe.Pointer(in.Path)) @@ -1227,11 +1228,11 @@ func autoConvert_v1_ServiceReference_To_apiextensions_ServiceReference(in *Servi } // Convert_v1_ServiceReference_To_apiextensions_ServiceReference is an autogenerated conversion function. -func Convert_v1_ServiceReference_To_apiextensions_ServiceReference(in *ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { +func Convert_v1_ServiceReference_To_apiextensions_ServiceReference(in *apiextensionsv1.ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { return autoConvert_v1_ServiceReference_To_apiextensions_ServiceReference(in, out, s) } -func autoConvert_apiextensions_ServiceReference_To_v1_ServiceReference(in *apiextensions.ServiceReference, out *ServiceReference, s conversion.Scope) error { +func autoConvert_apiextensions_ServiceReference_To_v1_ServiceReference(in *apiextensions.ServiceReference, out *apiextensionsv1.ServiceReference, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.Name out.Path = (*string)(unsafe.Pointer(in.Path)) @@ -1242,31 +1243,31 @@ func autoConvert_apiextensions_ServiceReference_To_v1_ServiceReference(in *apiex } // Convert_apiextensions_ServiceReference_To_v1_ServiceReference is an autogenerated conversion function. -func Convert_apiextensions_ServiceReference_To_v1_ServiceReference(in *apiextensions.ServiceReference, out *ServiceReference, s conversion.Scope) error { +func Convert_apiextensions_ServiceReference_To_v1_ServiceReference(in *apiextensions.ServiceReference, out *apiextensionsv1.ServiceReference, s conversion.Scope) error { return autoConvert_apiextensions_ServiceReference_To_v1_ServiceReference(in, out, s) } -func autoConvert_v1_ValidationRule_To_apiextensions_ValidationRule(in *ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { +func autoConvert_v1_ValidationRule_To_apiextensions_ValidationRule(in *apiextensionsv1.ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { *out = *(*apiextensions.ValidationRule)(unsafe.Pointer(in)) return nil } // Convert_v1_ValidationRule_To_apiextensions_ValidationRule is an autogenerated conversion function. -func Convert_v1_ValidationRule_To_apiextensions_ValidationRule(in *ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { +func Convert_v1_ValidationRule_To_apiextensions_ValidationRule(in *apiextensionsv1.ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { return autoConvert_v1_ValidationRule_To_apiextensions_ValidationRule(in, out, s) } -func autoConvert_apiextensions_ValidationRule_To_v1_ValidationRule(in *apiextensions.ValidationRule, out *ValidationRule, s conversion.Scope) error { - *out = *(*ValidationRule)(unsafe.Pointer(in)) +func autoConvert_apiextensions_ValidationRule_To_v1_ValidationRule(in *apiextensions.ValidationRule, out *apiextensionsv1.ValidationRule, s conversion.Scope) error { + *out = *(*apiextensionsv1.ValidationRule)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_ValidationRule_To_v1_ValidationRule is an autogenerated conversion function. -func Convert_apiextensions_ValidationRule_To_v1_ValidationRule(in *apiextensions.ValidationRule, out *ValidationRule, s conversion.Scope) error { +func Convert_apiextensions_ValidationRule_To_v1_ValidationRule(in *apiextensions.ValidationRule, out *apiextensionsv1.ValidationRule, s conversion.Scope) error { return autoConvert_apiextensions_ValidationRule_To_v1_ValidationRule(in, out, s) } -func autoConvert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { +func autoConvert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *apiextensionsv1.WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { out.URL = (*string)(unsafe.Pointer(in.URL)) if in.Service != nil { in, out := &in.Service, &out.Service @@ -1282,15 +1283,15 @@ func autoConvert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in } // Convert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig is an autogenerated conversion function. -func Convert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { +func Convert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *apiextensionsv1.WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { return autoConvert_v1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in, out, s) } -func autoConvert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *WebhookClientConfig, s conversion.Scope) error { +func autoConvert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *apiextensionsv1.WebhookClientConfig, s conversion.Scope) error { out.URL = (*string)(unsafe.Pointer(in.URL)) if in.Service != nil { in, out := &in.Service, &out.Service - *out = new(ServiceReference) + *out = new(apiextensionsv1.ServiceReference) if err := Convert_apiextensions_ServiceReference_To_v1_ServiceReference(*in, *out, s); err != nil { return err } @@ -1302,6 +1303,6 @@ func autoConvert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in } // Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig is an autogenerated conversion function. -func Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *WebhookClientConfig, s conversion.Scope) error { +func Convert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *apiextensionsv1.WebhookClientConfig, s conversion.Scope) error { return autoConvert_apiextensions_WebhookClientConfig_To_v1_WebhookClientConfig(in, out, s) } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go index 85e1836c167..32527fa0361 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go @@ -24,6 +24,7 @@ package v1beta1 import ( unsafe "unsafe" + apiextensionsv1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" @@ -37,260 +38,260 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*CustomResourceColumnDefinition)(nil), (*apiextensions.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(a.(*CustomResourceColumnDefinition), b.(*apiextensions.CustomResourceColumnDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceColumnDefinition)(nil), (*apiextensions.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(a.(*apiextensionsv1beta1.CustomResourceColumnDefinition), b.(*apiextensions.CustomResourceColumnDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceColumnDefinition)(nil), (*CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(a.(*apiextensions.CustomResourceColumnDefinition), b.(*CustomResourceColumnDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceColumnDefinition)(nil), (*apiextensionsv1beta1.CustomResourceColumnDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(a.(*apiextensions.CustomResourceColumnDefinition), b.(*apiextensionsv1beta1.CustomResourceColumnDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceConversion)(nil), (*apiextensions.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(a.(*CustomResourceConversion), b.(*apiextensions.CustomResourceConversion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceConversion)(nil), (*apiextensions.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(a.(*apiextensionsv1beta1.CustomResourceConversion), b.(*apiextensions.CustomResourceConversion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceConversion)(nil), (*CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(a.(*apiextensions.CustomResourceConversion), b.(*CustomResourceConversion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceConversion)(nil), (*apiextensionsv1beta1.CustomResourceConversion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(a.(*apiextensions.CustomResourceConversion), b.(*apiextensionsv1beta1.CustomResourceConversion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinition)(nil), (*apiextensions.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(a.(*CustomResourceDefinition), b.(*apiextensions.CustomResourceDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinition)(nil), (*apiextensions.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(a.(*apiextensionsv1beta1.CustomResourceDefinition), b.(*apiextensions.CustomResourceDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinition)(nil), (*CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(a.(*apiextensions.CustomResourceDefinition), b.(*CustomResourceDefinition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinition)(nil), (*apiextensionsv1beta1.CustomResourceDefinition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(a.(*apiextensions.CustomResourceDefinition), b.(*apiextensionsv1beta1.CustomResourceDefinition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionCondition)(nil), (*apiextensions.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(a.(*CustomResourceDefinitionCondition), b.(*apiextensions.CustomResourceDefinitionCondition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionCondition)(nil), (*apiextensions.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(a.(*apiextensionsv1beta1.CustomResourceDefinitionCondition), b.(*apiextensions.CustomResourceDefinitionCondition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionCondition)(nil), (*CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(a.(*apiextensions.CustomResourceDefinitionCondition), b.(*CustomResourceDefinitionCondition), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionCondition)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionCondition)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(a.(*apiextensions.CustomResourceDefinitionCondition), b.(*apiextensionsv1beta1.CustomResourceDefinitionCondition), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionList)(nil), (*apiextensions.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(a.(*CustomResourceDefinitionList), b.(*apiextensions.CustomResourceDefinitionList), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionList)(nil), (*apiextensions.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(a.(*apiextensionsv1beta1.CustomResourceDefinitionList), b.(*apiextensions.CustomResourceDefinitionList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionList)(nil), (*CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(a.(*apiextensions.CustomResourceDefinitionList), b.(*CustomResourceDefinitionList), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionList)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(a.(*apiextensions.CustomResourceDefinitionList), b.(*apiextensionsv1beta1.CustomResourceDefinitionList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionNames)(nil), (*apiextensions.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(a.(*CustomResourceDefinitionNames), b.(*apiextensions.CustomResourceDefinitionNames), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionNames)(nil), (*apiextensions.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(a.(*apiextensionsv1beta1.CustomResourceDefinitionNames), b.(*apiextensions.CustomResourceDefinitionNames), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionNames)(nil), (*CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(a.(*apiextensions.CustomResourceDefinitionNames), b.(*CustomResourceDefinitionNames), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionNames)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionNames)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(a.(*apiextensions.CustomResourceDefinitionNames), b.(*apiextensionsv1beta1.CustomResourceDefinitionNames), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionSpec)(nil), (*apiextensions.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(a.(*CustomResourceDefinitionSpec), b.(*apiextensions.CustomResourceDefinitionSpec), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionSpec)(nil), (*apiextensions.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(a.(*apiextensionsv1beta1.CustomResourceDefinitionSpec), b.(*apiextensions.CustomResourceDefinitionSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionSpec)(nil), (*CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(a.(*apiextensions.CustomResourceDefinitionSpec), b.(*CustomResourceDefinitionSpec), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionSpec)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(a.(*apiextensions.CustomResourceDefinitionSpec), b.(*apiextensionsv1beta1.CustomResourceDefinitionSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionStatus)(nil), (*apiextensions.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(a.(*CustomResourceDefinitionStatus), b.(*apiextensions.CustomResourceDefinitionStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionStatus)(nil), (*apiextensions.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(a.(*apiextensionsv1beta1.CustomResourceDefinitionStatus), b.(*apiextensions.CustomResourceDefinitionStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionStatus)(nil), (*CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(a.(*apiextensions.CustomResourceDefinitionStatus), b.(*CustomResourceDefinitionStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionStatus)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(a.(*apiextensions.CustomResourceDefinitionStatus), b.(*apiextensionsv1beta1.CustomResourceDefinitionStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceDefinitionVersion)(nil), (*apiextensions.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(a.(*CustomResourceDefinitionVersion), b.(*apiextensions.CustomResourceDefinitionVersion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceDefinitionVersion)(nil), (*apiextensions.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(a.(*apiextensionsv1beta1.CustomResourceDefinitionVersion), b.(*apiextensions.CustomResourceDefinitionVersion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionVersion)(nil), (*CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(a.(*apiextensions.CustomResourceDefinitionVersion), b.(*CustomResourceDefinitionVersion), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceDefinitionVersion)(nil), (*apiextensionsv1beta1.CustomResourceDefinitionVersion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(a.(*apiextensions.CustomResourceDefinitionVersion), b.(*apiextensionsv1beta1.CustomResourceDefinitionVersion), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresourceScale)(nil), (*apiextensions.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(a.(*CustomResourceSubresourceScale), b.(*apiextensions.CustomResourceSubresourceScale), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceSubresourceScale)(nil), (*apiextensions.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(a.(*apiextensionsv1beta1.CustomResourceSubresourceScale), b.(*apiextensions.CustomResourceSubresourceScale), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceScale)(nil), (*CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(a.(*apiextensions.CustomResourceSubresourceScale), b.(*CustomResourceSubresourceScale), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceScale)(nil), (*apiextensionsv1beta1.CustomResourceSubresourceScale)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(a.(*apiextensions.CustomResourceSubresourceScale), b.(*apiextensionsv1beta1.CustomResourceSubresourceScale), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresourceStatus)(nil), (*apiextensions.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(a.(*CustomResourceSubresourceStatus), b.(*apiextensions.CustomResourceSubresourceStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceSubresourceStatus)(nil), (*apiextensions.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(a.(*apiextensionsv1beta1.CustomResourceSubresourceStatus), b.(*apiextensions.CustomResourceSubresourceStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceStatus)(nil), (*CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(a.(*apiextensions.CustomResourceSubresourceStatus), b.(*CustomResourceSubresourceStatus), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresourceStatus)(nil), (*apiextensionsv1beta1.CustomResourceSubresourceStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(a.(*apiextensions.CustomResourceSubresourceStatus), b.(*apiextensionsv1beta1.CustomResourceSubresourceStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceSubresources)(nil), (*apiextensions.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(a.(*CustomResourceSubresources), b.(*apiextensions.CustomResourceSubresources), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceSubresources)(nil), (*apiextensions.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(a.(*apiextensionsv1beta1.CustomResourceSubresources), b.(*apiextensions.CustomResourceSubresources), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresources)(nil), (*CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(a.(*apiextensions.CustomResourceSubresources), b.(*CustomResourceSubresources), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceSubresources)(nil), (*apiextensionsv1beta1.CustomResourceSubresources)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(a.(*apiextensions.CustomResourceSubresources), b.(*apiextensionsv1beta1.CustomResourceSubresources), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CustomResourceValidation)(nil), (*apiextensions.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(a.(*CustomResourceValidation), b.(*apiextensions.CustomResourceValidation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.CustomResourceValidation)(nil), (*apiextensions.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(a.(*apiextensionsv1beta1.CustomResourceValidation), b.(*apiextensions.CustomResourceValidation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceValidation)(nil), (*CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(a.(*apiextensions.CustomResourceValidation), b.(*CustomResourceValidation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.CustomResourceValidation)(nil), (*apiextensionsv1beta1.CustomResourceValidation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(a.(*apiextensions.CustomResourceValidation), b.(*apiextensionsv1beta1.CustomResourceValidation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ExternalDocumentation)(nil), (*apiextensions.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(a.(*ExternalDocumentation), b.(*apiextensions.ExternalDocumentation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.ExternalDocumentation)(nil), (*apiextensions.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(a.(*apiextensionsv1beta1.ExternalDocumentation), b.(*apiextensions.ExternalDocumentation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ExternalDocumentation)(nil), (*ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(a.(*apiextensions.ExternalDocumentation), b.(*ExternalDocumentation), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ExternalDocumentation)(nil), (*apiextensionsv1beta1.ExternalDocumentation)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(a.(*apiextensions.ExternalDocumentation), b.(*apiextensionsv1beta1.ExternalDocumentation), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaProps)(nil), (*apiextensions.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(a.(*JSONSchemaProps), b.(*apiextensions.JSONSchemaProps), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.JSONSchemaProps)(nil), (*apiextensions.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(a.(*apiextensionsv1beta1.JSONSchemaProps), b.(*apiextensions.JSONSchemaProps), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrArray)(nil), (*apiextensions.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(a.(*JSONSchemaPropsOrArray), b.(*apiextensions.JSONSchemaPropsOrArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.JSONSchemaPropsOrArray)(nil), (*apiextensions.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(a.(*apiextensionsv1beta1.JSONSchemaPropsOrArray), b.(*apiextensions.JSONSchemaPropsOrArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrArray)(nil), (*JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(a.(*apiextensions.JSONSchemaPropsOrArray), b.(*JSONSchemaPropsOrArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrArray)(nil), (*apiextensionsv1beta1.JSONSchemaPropsOrArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(a.(*apiextensions.JSONSchemaPropsOrArray), b.(*apiextensionsv1beta1.JSONSchemaPropsOrArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrBool)(nil), (*apiextensions.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(a.(*JSONSchemaPropsOrBool), b.(*apiextensions.JSONSchemaPropsOrBool), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.JSONSchemaPropsOrBool)(nil), (*apiextensions.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(a.(*apiextensionsv1beta1.JSONSchemaPropsOrBool), b.(*apiextensions.JSONSchemaPropsOrBool), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrBool)(nil), (*JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(a.(*apiextensions.JSONSchemaPropsOrBool), b.(*JSONSchemaPropsOrBool), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrBool)(nil), (*apiextensionsv1beta1.JSONSchemaPropsOrBool)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(a.(*apiextensions.JSONSchemaPropsOrBool), b.(*apiextensionsv1beta1.JSONSchemaPropsOrBool), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*JSONSchemaPropsOrStringArray)(nil), (*apiextensions.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(a.(*JSONSchemaPropsOrStringArray), b.(*apiextensions.JSONSchemaPropsOrStringArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.JSONSchemaPropsOrStringArray)(nil), (*apiextensions.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(a.(*apiextensionsv1beta1.JSONSchemaPropsOrStringArray), b.(*apiextensions.JSONSchemaPropsOrStringArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrStringArray)(nil), (*JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(a.(*apiextensions.JSONSchemaPropsOrStringArray), b.(*JSONSchemaPropsOrStringArray), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.JSONSchemaPropsOrStringArray)(nil), (*apiextensionsv1beta1.JSONSchemaPropsOrStringArray)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(a.(*apiextensions.JSONSchemaPropsOrStringArray), b.(*apiextensionsv1beta1.JSONSchemaPropsOrStringArray), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SelectableField)(nil), (*apiextensions.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_SelectableField_To_apiextensions_SelectableField(a.(*SelectableField), b.(*apiextensions.SelectableField), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.SelectableField)(nil), (*apiextensions.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SelectableField_To_apiextensions_SelectableField(a.(*apiextensionsv1beta1.SelectableField), b.(*apiextensions.SelectableField), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.SelectableField)(nil), (*SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_SelectableField_To_v1beta1_SelectableField(a.(*apiextensions.SelectableField), b.(*SelectableField), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.SelectableField)(nil), (*apiextensionsv1beta1.SelectableField)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_SelectableField_To_v1beta1_SelectableField(a.(*apiextensions.SelectableField), b.(*apiextensionsv1beta1.SelectableField), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ServiceReference)(nil), (*apiextensions.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(a.(*ServiceReference), b.(*apiextensions.ServiceReference), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.ServiceReference)(nil), (*apiextensions.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(a.(*apiextensionsv1beta1.ServiceReference), b.(*apiextensions.ServiceReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ServiceReference)(nil), (*ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(a.(*apiextensions.ServiceReference), b.(*ServiceReference), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ServiceReference)(nil), (*apiextensionsv1beta1.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(a.(*apiextensions.ServiceReference), b.(*apiextensionsv1beta1.ServiceReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ValidationRule)(nil), (*apiextensions.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(a.(*ValidationRule), b.(*apiextensions.ValidationRule), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.ValidationRule)(nil), (*apiextensions.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(a.(*apiextensionsv1beta1.ValidationRule), b.(*apiextensions.ValidationRule), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.ValidationRule)(nil), (*ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(a.(*apiextensions.ValidationRule), b.(*ValidationRule), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.ValidationRule)(nil), (*apiextensionsv1beta1.ValidationRule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(a.(*apiextensions.ValidationRule), b.(*apiextensionsv1beta1.ValidationRule), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*WebhookClientConfig)(nil), (*apiextensions.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(a.(*WebhookClientConfig), b.(*apiextensions.WebhookClientConfig), scope) + if err := s.AddGeneratedConversionFunc((*apiextensionsv1beta1.WebhookClientConfig)(nil), (*apiextensions.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(a.(*apiextensionsv1beta1.WebhookClientConfig), b.(*apiextensions.WebhookClientConfig), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*apiextensions.WebhookClientConfig)(nil), (*WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(a.(*apiextensions.WebhookClientConfig), b.(*WebhookClientConfig), scope) + if err := s.AddGeneratedConversionFunc((*apiextensions.WebhookClientConfig)(nil), (*apiextensionsv1beta1.WebhookClientConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(a.(*apiextensions.WebhookClientConfig), b.(*apiextensionsv1beta1.WebhookClientConfig), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.JSONSchemaProps)(nil), (*JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(a.(*apiextensions.JSONSchemaProps), b.(*JSONSchemaProps), scope) + if err := s.AddConversionFunc((*apiextensions.JSONSchemaProps)(nil), (*apiextensionsv1beta1.JSONSchemaProps)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(a.(*apiextensions.JSONSchemaProps), b.(*apiextensionsv1beta1.JSONSchemaProps), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*apiextensions.JSON)(nil), (*JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_apiextensions_JSON_To_v1beta1_JSON(a.(*apiextensions.JSON), b.(*JSON), scope) + if err := s.AddConversionFunc((*apiextensions.JSON)(nil), (*apiextensionsv1beta1.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_apiextensions_JSON_To_v1beta1_JSON(a.(*apiextensions.JSON), b.(*apiextensionsv1beta1.JSON), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*JSON)(nil), (*apiextensions.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_JSON_To_apiextensions_JSON(a.(*JSON), b.(*apiextensions.JSON), scope) + if err := s.AddConversionFunc((*apiextensionsv1beta1.JSON)(nil), (*apiextensions.JSON)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_JSON_To_apiextensions_JSON(a.(*apiextensionsv1beta1.JSON), b.(*apiextensions.JSON), scope) }); err != nil { return err } return nil } -func autoConvert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *apiextensionsv1beta1.CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceColumnDefinition)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in *apiextensionsv1beta1.CustomResourceColumnDefinition, out *apiextensions.CustomResourceColumnDefinition, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceColumnDefinition_To_apiextensions_CustomResourceColumnDefinition(in, out, s) } -func autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *CustomResourceColumnDefinition, s conversion.Scope) error { - *out = *(*CustomResourceColumnDefinition)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *apiextensionsv1beta1.CustomResourceColumnDefinition, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceColumnDefinition)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *CustomResourceColumnDefinition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(in *apiextensions.CustomResourceColumnDefinition, out *apiextensionsv1beta1.CustomResourceColumnDefinition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceColumnDefinition_To_v1beta1_CustomResourceColumnDefinition(in, out, s) } -func autoConvert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *apiextensionsv1beta1.CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { out.Strategy = apiextensions.ConversionStrategyType(in.Strategy) if in.WebhookClientConfig != nil { in, out := &in.WebhookClientConfig, &out.WebhookClientConfig @@ -306,15 +307,15 @@ func autoConvert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourc } // Convert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in *apiextensionsv1beta1.CustomResourceConversion, out *apiextensions.CustomResourceConversion, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceConversion_To_apiextensions_CustomResourceConversion(in, out, s) } -func autoConvert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *CustomResourceConversion, s conversion.Scope) error { - out.Strategy = ConversionStrategyType(in.Strategy) +func autoConvert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *apiextensionsv1beta1.CustomResourceConversion, s conversion.Scope) error { + out.Strategy = apiextensionsv1beta1.ConversionStrategyType(in.Strategy) if in.WebhookClientConfig != nil { in, out := &in.WebhookClientConfig, &out.WebhookClientConfig - *out = new(WebhookClientConfig) + *out = new(apiextensionsv1beta1.WebhookClientConfig) if err := Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(*in, *out, s); err != nil { return err } @@ -326,11 +327,11 @@ func autoConvert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourc } // Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *CustomResourceConversion, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(in *apiextensions.CustomResourceConversion, out *apiextensionsv1beta1.CustomResourceConversion, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *apiextensionsv1beta1.CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { return err @@ -342,11 +343,11 @@ func autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourc } // Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *apiextensionsv1beta1.CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *apiextensionsv1beta1.CustomResourceDefinition, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { return err @@ -358,31 +359,31 @@ func autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourc } // Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *apiextensionsv1beta1.CustomResourceDefinition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *apiextensionsv1beta1.CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionCondition)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *apiextensionsv1beta1.CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionCondition)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *apiextensionsv1beta1.CustomResourceDefinitionCondition, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceDefinitionCondition)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *apiextensionsv1beta1.CustomResourceDefinitionCondition, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *apiextensionsv1beta1.CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items @@ -399,15 +400,15 @@ func autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomRes } // Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *apiextensionsv1beta1.CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *apiextensionsv1beta1.CustomResourceDefinitionList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]CustomResourceDefinition, len(*in)) + *out = make([]apiextensionsv1beta1.CustomResourceDefinition, len(*in)) for i := range *in { if err := Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -420,31 +421,31 @@ func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomRes } // Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *apiextensionsv1beta1.CustomResourceDefinitionList, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *apiextensionsv1beta1.CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionNames)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *apiextensionsv1beta1.CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionNames)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *apiextensionsv1beta1.CustomResourceDefinitionNames, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceDefinitionNames)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *apiextensionsv1beta1.CustomResourceDefinitionNames, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *apiextensionsv1beta1.CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { out.Group = in.Group out.Version = in.Version if err := Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { @@ -488,30 +489,30 @@ func autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomRes } // Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *apiextensionsv1beta1.CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *apiextensionsv1beta1.CustomResourceDefinitionSpec, s conversion.Scope) error { out.Group = in.Group out.Version = in.Version if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { return err } - out.Scope = ResourceScope(in.Scope) + out.Scope = apiextensionsv1beta1.ResourceScope(in.Scope) if in.Validation != nil { in, out := &in.Validation, &out.Validation - *out = new(CustomResourceValidation) + *out = new(apiextensionsv1beta1.CustomResourceValidation) if err := Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(*in, *out, s); err != nil { return err } } else { out.Validation = nil } - out.Subresources = (*CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) + out.Subresources = (*apiextensionsv1beta1.CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) if in.Versions != nil { in, out := &in.Versions, &out.Versions - *out = make([]CustomResourceDefinitionVersion, len(*in)) + *out = make([]apiextensionsv1beta1.CustomResourceDefinitionVersion, len(*in)) for i := range *in { if err := Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -520,11 +521,11 @@ func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomRes } else { out.Versions = nil } - out.AdditionalPrinterColumns = *(*[]CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) - out.SelectableFields = *(*[]SelectableField)(unsafe.Pointer(&in.SelectableFields)) + out.AdditionalPrinterColumns = *(*[]apiextensionsv1beta1.CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) + out.SelectableFields = *(*[]apiextensionsv1beta1.SelectableField)(unsafe.Pointer(&in.SelectableFields)) if in.Conversion != nil { in, out := &in.Conversion, &out.Conversion - *out = new(CustomResourceConversion) + *out = new(apiextensionsv1beta1.CustomResourceConversion) if err := Convert_apiextensions_CustomResourceConversion_To_v1beta1_CustomResourceConversion(*in, *out, s); err != nil { return err } @@ -536,31 +537,31 @@ func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomRes } // Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *apiextensionsv1beta1.CustomResourceDefinitionSpec, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *apiextensionsv1beta1.CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceDefinitionStatus)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *apiextensionsv1beta1.CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { - *out = *(*CustomResourceDefinitionStatus)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *apiextensionsv1beta1.CustomResourceDefinitionStatus, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceDefinitionStatus)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *apiextensionsv1beta1.CustomResourceDefinitionStatus, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in, out, s) } -func autoConvert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *apiextensionsv1beta1.CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { out.Name = in.Name out.Served = in.Served out.Storage = in.Storage @@ -582,11 +583,11 @@ func autoConvert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_Custom } // Convert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in *apiextensionsv1beta1.CustomResourceDefinitionVersion, out *apiextensions.CustomResourceDefinitionVersion, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceDefinitionVersion_To_apiextensions_CustomResourceDefinitionVersion(in, out, s) } -func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *CustomResourceDefinitionVersion, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *apiextensionsv1beta1.CustomResourceDefinitionVersion, s conversion.Scope) error { out.Name = in.Name out.Served = in.Served out.Storage = in.Storage @@ -594,85 +595,85 @@ func autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_Custom out.DeprecationWarning = (*string)(unsafe.Pointer(in.DeprecationWarning)) if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(CustomResourceValidation) + *out = new(apiextensionsv1beta1.CustomResourceValidation) if err := Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(*in, *out, s); err != nil { return err } } else { out.Schema = nil } - out.Subresources = (*CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) - out.AdditionalPrinterColumns = *(*[]CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) - out.SelectableFields = *(*[]SelectableField)(unsafe.Pointer(&in.SelectableFields)) + out.Subresources = (*apiextensionsv1beta1.CustomResourceSubresources)(unsafe.Pointer(in.Subresources)) + out.AdditionalPrinterColumns = *(*[]apiextensionsv1beta1.CustomResourceColumnDefinition)(unsafe.Pointer(&in.AdditionalPrinterColumns)) + out.SelectableFields = *(*[]apiextensionsv1beta1.SelectableField)(unsafe.Pointer(&in.SelectableFields)) return nil } // Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *CustomResourceDefinitionVersion, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(in *apiextensions.CustomResourceDefinitionVersion, out *apiextensionsv1beta1.CustomResourceDefinitionVersion, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceDefinitionVersion_To_v1beta1_CustomResourceDefinitionVersion(in, out, s) } -func autoConvert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *apiextensionsv1beta1.CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresourceScale)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in *apiextensionsv1beta1.CustomResourceSubresourceScale, out *apiextensions.CustomResourceSubresourceScale, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceSubresourceScale_To_apiextensions_CustomResourceSubresourceScale(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *CustomResourceSubresourceScale, s conversion.Scope) error { - *out = *(*CustomResourceSubresourceScale)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *apiextensionsv1beta1.CustomResourceSubresourceScale, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceSubresourceScale)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *CustomResourceSubresourceScale, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(in *apiextensions.CustomResourceSubresourceScale, out *apiextensionsv1beta1.CustomResourceSubresourceScale, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresourceScale_To_v1beta1_CustomResourceSubresourceScale(in, out, s) } -func autoConvert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *apiextensionsv1beta1.CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresourceStatus)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in *apiextensionsv1beta1.CustomResourceSubresourceStatus, out *apiextensions.CustomResourceSubresourceStatus, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceSubresourceStatus_To_apiextensions_CustomResourceSubresourceStatus(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *CustomResourceSubresourceStatus, s conversion.Scope) error { - *out = *(*CustomResourceSubresourceStatus)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *apiextensionsv1beta1.CustomResourceSubresourceStatus, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceSubresourceStatus)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *CustomResourceSubresourceStatus, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(in *apiextensions.CustomResourceSubresourceStatus, out *apiextensionsv1beta1.CustomResourceSubresourceStatus, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresourceStatus_To_v1beta1_CustomResourceSubresourceStatus(in, out, s) } -func autoConvert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *apiextensionsv1beta1.CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { *out = *(*apiextensions.CustomResourceSubresources)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in *apiextensionsv1beta1.CustomResourceSubresources, out *apiextensions.CustomResourceSubresources, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceSubresources_To_apiextensions_CustomResourceSubresources(in, out, s) } -func autoConvert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *CustomResourceSubresources, s conversion.Scope) error { - *out = *(*CustomResourceSubresources)(unsafe.Pointer(in)) +func autoConvert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *apiextensionsv1beta1.CustomResourceSubresources, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.CustomResourceSubresources)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *CustomResourceSubresources, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(in *apiextensions.CustomResourceSubresources, out *apiextensionsv1beta1.CustomResourceSubresources, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceSubresources_To_v1beta1_CustomResourceSubresources(in, out, s) } -func autoConvert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { +func autoConvert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *apiextensionsv1beta1.CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { if in.OpenAPIV3Schema != nil { in, out := &in.OpenAPIV3Schema, &out.OpenAPIV3Schema *out = new(apiextensions.JSONSchemaProps) @@ -686,14 +687,14 @@ func autoConvert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourc } // Convert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation is an autogenerated conversion function. -func Convert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { +func Convert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in *apiextensionsv1beta1.CustomResourceValidation, out *apiextensions.CustomResourceValidation, s conversion.Scope) error { return autoConvert_v1beta1_CustomResourceValidation_To_apiextensions_CustomResourceValidation(in, out, s) } -func autoConvert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *CustomResourceValidation, s conversion.Scope) error { +func autoConvert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *apiextensionsv1beta1.CustomResourceValidation, s conversion.Scope) error { if in.OpenAPIV3Schema != nil { in, out := &in.OpenAPIV3Schema, &out.OpenAPIV3Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -704,41 +705,41 @@ func autoConvert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourc } // Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *CustomResourceValidation, s conversion.Scope) error { +func Convert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(in *apiextensions.CustomResourceValidation, out *apiextensionsv1beta1.CustomResourceValidation, s conversion.Scope) error { return autoConvert_apiextensions_CustomResourceValidation_To_v1beta1_CustomResourceValidation(in, out, s) } -func autoConvert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { +func autoConvert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *apiextensionsv1beta1.ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { *out = *(*apiextensions.ExternalDocumentation)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation is an autogenerated conversion function. -func Convert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { +func Convert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in *apiextensionsv1beta1.ExternalDocumentation, out *apiextensions.ExternalDocumentation, s conversion.Scope) error { return autoConvert_v1beta1_ExternalDocumentation_To_apiextensions_ExternalDocumentation(in, out, s) } -func autoConvert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *ExternalDocumentation, s conversion.Scope) error { - *out = *(*ExternalDocumentation)(unsafe.Pointer(in)) +func autoConvert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *apiextensionsv1beta1.ExternalDocumentation, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.ExternalDocumentation)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation is an autogenerated conversion function. -func Convert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *ExternalDocumentation, s conversion.Scope) error { +func Convert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(in *apiextensions.ExternalDocumentation, out *apiextensionsv1beta1.ExternalDocumentation, s conversion.Scope) error { return autoConvert_apiextensions_ExternalDocumentation_To_v1beta1_ExternalDocumentation(in, out, s) } -func autoConvert_v1beta1_JSON_To_apiextensions_JSON(in *JSON, out *apiextensions.JSON, s conversion.Scope) error { +func autoConvert_v1beta1_JSON_To_apiextensions_JSON(in *apiextensionsv1beta1.JSON, out *apiextensions.JSON, s conversion.Scope) error { // WARNING: in.Raw requires manual conversion: does not exist in peer-type return nil } -func autoConvert_apiextensions_JSON_To_v1beta1_JSON(in *apiextensions.JSON, out *JSON, s conversion.Scope) error { +func autoConvert_apiextensions_JSON_To_v1beta1_JSON(in *apiextensions.JSON, out *apiextensionsv1beta1.JSON, s conversion.Scope) error { // FIXME: Type apiextensions.JSON is unsupported. return nil } -func autoConvert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { +func autoConvert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *apiextensionsv1beta1.JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { out.ID = in.ID out.Schema = apiextensions.JSONSchemaURL(in.Schema) out.Ref = (*string)(unsafe.Pointer(in.Ref)) @@ -923,13 +924,13 @@ func autoConvert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JS } // Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps is an autogenerated conversion function. -func Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { +func Convert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in *apiextensionsv1beta1.JSONSchemaProps, out *apiextensions.JSONSchemaProps, s conversion.Scope) error { return autoConvert_v1beta1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(in, out, s) } -func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *apiextensionsv1beta1.JSONSchemaProps, s conversion.Scope) error { out.ID = in.ID - out.Schema = JSONSchemaURL(in.Schema) + out.Schema = apiextensionsv1beta1.JSONSchemaURL(in.Schema) out.Ref = (*string)(unsafe.Pointer(in.Ref)) out.Description = in.Description out.Type = in.Type @@ -938,7 +939,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap out.Title = in.Title if in.Default != nil { in, out := &in.Default, &out.Default - *out = new(JSON) + *out = new(apiextensionsv1beta1.JSON) if err := Convert_apiextensions_JSON_To_v1beta1_JSON(*in, *out, s); err != nil { return err } @@ -958,7 +959,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap out.MultipleOf = (*float64)(unsafe.Pointer(in.MultipleOf)) if in.Enum != nil { in, out := &in.Enum, &out.Enum - *out = make([]JSON, len(*in)) + *out = make([]apiextensionsv1beta1.JSON, len(*in)) for i := range *in { if err := Convert_apiextensions_JSON_To_v1beta1_JSON(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -972,7 +973,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap out.Required = *(*[]string)(unsafe.Pointer(&in.Required)) if in.Items != nil { in, out := &in.Items, &out.Items - *out = new(JSONSchemaPropsOrArray) + *out = new(apiextensionsv1beta1.JSONSchemaPropsOrArray) if err := Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(*in, *out, s); err != nil { return err } @@ -981,7 +982,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.AllOf != nil { in, out := &in.AllOf, &out.AllOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -992,7 +993,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.OneOf != nil { in, out := &in.OneOf, &out.OneOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -1003,7 +1004,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.AnyOf != nil { in, out := &in.AnyOf, &out.AnyOf - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -1014,7 +1015,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.Not != nil { in, out := &in.Not, &out.Not - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1023,9 +1024,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.Properties != nil { in, out := &in.Properties, &out.Properties - *out = make(map[string]JSONSchemaProps, len(*in)) + *out = make(map[string]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -1036,7 +1037,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.AdditionalProperties != nil { in, out := &in.AdditionalProperties, &out.AdditionalProperties - *out = new(JSONSchemaPropsOrBool) + *out = new(apiextensionsv1beta1.JSONSchemaPropsOrBool) if err := Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(*in, *out, s); err != nil { return err } @@ -1045,9 +1046,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.PatternProperties != nil { in, out := &in.PatternProperties, &out.PatternProperties - *out = make(map[string]JSONSchemaProps, len(*in)) + *out = make(map[string]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -1058,9 +1059,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.Dependencies != nil { in, out := &in.Dependencies, &out.Dependencies - *out = make(JSONSchemaDependencies, len(*in)) + *out = make(apiextensionsv1beta1.JSONSchemaDependencies, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaPropsOrStringArray) + newVal := new(apiextensionsv1beta1.JSONSchemaPropsOrStringArray) if err := Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(&val, newVal, s); err != nil { return err } @@ -1071,7 +1072,7 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.AdditionalItems != nil { in, out := &in.AdditionalItems, &out.AdditionalItems - *out = new(JSONSchemaPropsOrBool) + *out = new(apiextensionsv1beta1.JSONSchemaPropsOrBool) if err := Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(*in, *out, s); err != nil { return err } @@ -1080,9 +1081,9 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } if in.Definitions != nil { in, out := &in.Definitions, &out.Definitions - *out = make(JSONSchemaDefinitions, len(*in)) + *out = make(apiextensionsv1beta1.JSONSchemaDefinitions, len(*in)) for key, val := range *in { - newVal := new(JSONSchemaProps) + newVal := new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&val, newVal, s); err != nil { return err } @@ -1091,10 +1092,10 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap } else { out.Definitions = nil } - out.ExternalDocs = (*ExternalDocumentation)(unsafe.Pointer(in.ExternalDocs)) + out.ExternalDocs = (*apiextensionsv1beta1.ExternalDocumentation)(unsafe.Pointer(in.ExternalDocs)) if in.Example != nil { in, out := &in.Example, &out.Example - *out = new(JSON) + *out = new(apiextensionsv1beta1.JSON) if err := Convert_apiextensions_JSON_To_v1beta1_JSON(*in, *out, s); err != nil { return err } @@ -1107,11 +1108,11 @@ func autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *ap out.XListMapKeys = *(*[]string)(unsafe.Pointer(&in.XListMapKeys)) out.XListType = (*string)(unsafe.Pointer(in.XListType)) out.XMapType = (*string)(unsafe.Pointer(in.XMapType)) - out.XValidations = *(*ValidationRules)(unsafe.Pointer(&in.XValidations)) + out.XValidations = *(*apiextensionsv1beta1.ValidationRules)(unsafe.Pointer(&in.XValidations)) return nil } -func autoConvert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { +func autoConvert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *apiextensionsv1beta1.JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema *out = new(apiextensions.JSONSchemaProps) @@ -1136,14 +1137,14 @@ func autoConvert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaProps } // Convert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray is an autogenerated conversion function. -func Convert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { +func Convert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in *apiextensionsv1beta1.JSONSchemaPropsOrArray, out *apiextensions.JSONSchemaPropsOrArray, s conversion.Scope) error { return autoConvert_v1beta1_JSONSchemaPropsOrArray_To_apiextensions_JSONSchemaPropsOrArray(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *JSONSchemaPropsOrArray, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *apiextensionsv1beta1.JSONSchemaPropsOrArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1152,7 +1153,7 @@ func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaProps } if in.JSONSchemas != nil { in, out := &in.JSONSchemas, &out.JSONSchemas - *out = make([]JSONSchemaProps, len(*in)) + *out = make([]apiextensionsv1beta1.JSONSchemaProps, len(*in)) for i := range *in { if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(&(*in)[i], &(*out)[i], s); err != nil { return err @@ -1165,11 +1166,11 @@ func autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaProps } // Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *JSONSchemaPropsOrArray, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(in *apiextensions.JSONSchemaPropsOrArray, out *apiextensionsv1beta1.JSONSchemaPropsOrArray, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrArray_To_v1beta1_JSONSchemaPropsOrArray(in, out, s) } -func autoConvert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { +func autoConvert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *apiextensionsv1beta1.JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { out.Allows = in.Allows if in.Schema != nil { in, out := &in.Schema, &out.Schema @@ -1184,15 +1185,15 @@ func autoConvert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsO } // Convert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool is an autogenerated conversion function. -func Convert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { +func Convert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in *apiextensionsv1beta1.JSONSchemaPropsOrBool, out *apiextensions.JSONSchemaPropsOrBool, s conversion.Scope) error { return autoConvert_v1beta1_JSONSchemaPropsOrBool_To_apiextensions_JSONSchemaPropsOrBool(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *JSONSchemaPropsOrBool, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *apiextensionsv1beta1.JSONSchemaPropsOrBool, s conversion.Scope) error { out.Allows = in.Allows if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1203,11 +1204,11 @@ func autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsO } // Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *JSONSchemaPropsOrBool, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(in *apiextensions.JSONSchemaPropsOrBool, out *apiextensionsv1beta1.JSONSchemaPropsOrBool, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrBool_To_v1beta1_JSONSchemaPropsOrBool(in, out, s) } -func autoConvert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func autoConvert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *apiextensionsv1beta1.JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema *out = new(apiextensions.JSONSchemaProps) @@ -1222,14 +1223,14 @@ func autoConvert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchem } // Convert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray is an autogenerated conversion function. -func Convert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func Convert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in *apiextensionsv1beta1.JSONSchemaPropsOrStringArray, out *apiextensions.JSONSchemaPropsOrStringArray, s conversion.Scope) error { return autoConvert_v1beta1_JSONSchemaPropsOrStringArray_To_apiextensions_JSONSchemaPropsOrStringArray(in, out, s) } -func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *apiextensionsv1beta1.JSONSchemaPropsOrStringArray, s conversion.Scope) error { if in.Schema != nil { in, out := &in.Schema, &out.Schema - *out = new(JSONSchemaProps) + *out = new(apiextensionsv1beta1.JSONSchemaProps) if err := Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(*in, *out, s); err != nil { return err } @@ -1241,31 +1242,31 @@ func autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchem } // Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray is an autogenerated conversion function. -func Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *JSONSchemaPropsOrStringArray, s conversion.Scope) error { +func Convert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(in *apiextensions.JSONSchemaPropsOrStringArray, out *apiextensionsv1beta1.JSONSchemaPropsOrStringArray, s conversion.Scope) error { return autoConvert_apiextensions_JSONSchemaPropsOrStringArray_To_v1beta1_JSONSchemaPropsOrStringArray(in, out, s) } -func autoConvert_v1beta1_SelectableField_To_apiextensions_SelectableField(in *SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { +func autoConvert_v1beta1_SelectableField_To_apiextensions_SelectableField(in *apiextensionsv1beta1.SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { *out = *(*apiextensions.SelectableField)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_SelectableField_To_apiextensions_SelectableField is an autogenerated conversion function. -func Convert_v1beta1_SelectableField_To_apiextensions_SelectableField(in *SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { +func Convert_v1beta1_SelectableField_To_apiextensions_SelectableField(in *apiextensionsv1beta1.SelectableField, out *apiextensions.SelectableField, s conversion.Scope) error { return autoConvert_v1beta1_SelectableField_To_apiextensions_SelectableField(in, out, s) } -func autoConvert_apiextensions_SelectableField_To_v1beta1_SelectableField(in *apiextensions.SelectableField, out *SelectableField, s conversion.Scope) error { - *out = *(*SelectableField)(unsafe.Pointer(in)) +func autoConvert_apiextensions_SelectableField_To_v1beta1_SelectableField(in *apiextensions.SelectableField, out *apiextensionsv1beta1.SelectableField, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.SelectableField)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_SelectableField_To_v1beta1_SelectableField is an autogenerated conversion function. -func Convert_apiextensions_SelectableField_To_v1beta1_SelectableField(in *apiextensions.SelectableField, out *SelectableField, s conversion.Scope) error { +func Convert_apiextensions_SelectableField_To_v1beta1_SelectableField(in *apiextensions.SelectableField, out *apiextensionsv1beta1.SelectableField, s conversion.Scope) error { return autoConvert_apiextensions_SelectableField_To_v1beta1_SelectableField(in, out, s) } -func autoConvert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in *ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { +func autoConvert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in *apiextensionsv1beta1.ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.Name out.Path = (*string)(unsafe.Pointer(in.Path)) @@ -1276,11 +1277,11 @@ func autoConvert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in * } // Convert_v1beta1_ServiceReference_To_apiextensions_ServiceReference is an autogenerated conversion function. -func Convert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in *ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { +func Convert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in *apiextensionsv1beta1.ServiceReference, out *apiextensions.ServiceReference, s conversion.Scope) error { return autoConvert_v1beta1_ServiceReference_To_apiextensions_ServiceReference(in, out, s) } -func autoConvert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in *apiextensions.ServiceReference, out *ServiceReference, s conversion.Scope) error { +func autoConvert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in *apiextensions.ServiceReference, out *apiextensionsv1beta1.ServiceReference, s conversion.Scope) error { out.Namespace = in.Namespace out.Name = in.Name out.Path = (*string)(unsafe.Pointer(in.Path)) @@ -1291,31 +1292,31 @@ func autoConvert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in * } // Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference is an autogenerated conversion function. -func Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in *apiextensions.ServiceReference, out *ServiceReference, s conversion.Scope) error { +func Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in *apiextensions.ServiceReference, out *apiextensionsv1beta1.ServiceReference, s conversion.Scope) error { return autoConvert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(in, out, s) } -func autoConvert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(in *ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { +func autoConvert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(in *apiextensionsv1beta1.ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { *out = *(*apiextensions.ValidationRule)(unsafe.Pointer(in)) return nil } // Convert_v1beta1_ValidationRule_To_apiextensions_ValidationRule is an autogenerated conversion function. -func Convert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(in *ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { +func Convert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(in *apiextensionsv1beta1.ValidationRule, out *apiextensions.ValidationRule, s conversion.Scope) error { return autoConvert_v1beta1_ValidationRule_To_apiextensions_ValidationRule(in, out, s) } -func autoConvert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(in *apiextensions.ValidationRule, out *ValidationRule, s conversion.Scope) error { - *out = *(*ValidationRule)(unsafe.Pointer(in)) +func autoConvert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(in *apiextensions.ValidationRule, out *apiextensionsv1beta1.ValidationRule, s conversion.Scope) error { + *out = *(*apiextensionsv1beta1.ValidationRule)(unsafe.Pointer(in)) return nil } // Convert_apiextensions_ValidationRule_To_v1beta1_ValidationRule is an autogenerated conversion function. -func Convert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(in *apiextensions.ValidationRule, out *ValidationRule, s conversion.Scope) error { +func Convert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(in *apiextensions.ValidationRule, out *apiextensionsv1beta1.ValidationRule, s conversion.Scope) error { return autoConvert_apiextensions_ValidationRule_To_v1beta1_ValidationRule(in, out, s) } -func autoConvert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { +func autoConvert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *apiextensionsv1beta1.WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { out.URL = (*string)(unsafe.Pointer(in.URL)) if in.Service != nil { in, out := &in.Service, &out.Service @@ -1331,15 +1332,15 @@ func autoConvert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfi } // Convert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig is an autogenerated conversion function. -func Convert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { +func Convert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in *apiextensionsv1beta1.WebhookClientConfig, out *apiextensions.WebhookClientConfig, s conversion.Scope) error { return autoConvert_v1beta1_WebhookClientConfig_To_apiextensions_WebhookClientConfig(in, out, s) } -func autoConvert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *WebhookClientConfig, s conversion.Scope) error { +func autoConvert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *apiextensionsv1beta1.WebhookClientConfig, s conversion.Scope) error { out.URL = (*string)(unsafe.Pointer(in.URL)) if in.Service != nil { in, out := &in.Service, &out.Service - *out = new(ServiceReference) + *out = new(apiextensionsv1beta1.ServiceReference) if err := Convert_apiextensions_ServiceReference_To_v1beta1_ServiceReference(*in, *out, s); err != nil { return err } @@ -1351,6 +1352,6 @@ func autoConvert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfi } // Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig is an autogenerated conversion function. -func Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *WebhookClientConfig, s conversion.Scope) error { +func Convert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(in *apiextensions.WebhookClientConfig, out *apiextensionsv1beta1.WebhookClientConfig, s conversion.Scope) error { return autoConvert_apiextensions_WebhookClientConfig_To_v1beta1_WebhookClientConfig(in, out, s) } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/zz_generated.deepcopy.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/zz_generated.deepcopy.go index c2154a05fd5..5e1372528c3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package schema import ( - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + v1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go index 79c704bf671..a87e7a7c609 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go @@ -23,8 +23,8 @@ package openapi import ( v1 "k8s.io/api/autoscaling/v1" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsv1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1" + v1beta1 "k8s.io/apiextensions-api/pkg/apis/apiextensions/v1beta1" resource "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/vendor/modules.txt b/vendor/modules.txt index 75ffaf9cf88..ae39c1cf162 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1034,6 +1034,8 @@ gopkg.in/inf.v0 gopkg.in/natefinch/lumberjack.v2 # k8s.io/api v0.0.0 => ./staging/src/k8s.io/api ## explicit; go 1.27.0 +# k8s.io/apiextensions-api v0.0.0 => ./staging/src/k8s.io/apiextensions-api +## explicit; go 1.27.0 # k8s.io/apiextensions-apiserver v0.0.0 => ./staging/src/k8s.io/apiextensions-apiserver ## explicit; go 1.27.0 # k8s.io/apimachinery v0.0.0 => ./staging/src/k8s.io/apimachinery