diff --git a/pkg/apis/apps/v1/conversion.go b/pkg/apis/apps/v1/conversion.go index e5374bd28b2..a2ce0f19eaa 100644 --- a/pkg/apis/apps/v1/conversion.go +++ b/pkg/apis/apps/v1/conversion.go @@ -22,35 +22,10 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/apps" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions to handle the *int32 -> int32 - // conversion. A pointer is useful in the versioned type so we can default - // it, but a plain int32 is more convenient in the internal type. These - // functions are the same as the autogenerated ones in every other way. - err := scheme.AddConversionFuncs( - Convert_v1_Deployment_To_apps_Deployment, - Convert_apps_Deployment_To_v1_Deployment, - Convert_apps_DaemonSet_To_v1_DaemonSet, - Convert_v1_DaemonSet_To_apps_DaemonSet, - Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec, - Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec, - // extensions - // TODO: below conversions should be dropped in favor of auto-generated - // ones, see https://github.com/kubernetes/kubernetes/issues/39865 - Convert_v1_DeploymentSpec_To_apps_DeploymentSpec, - Convert_apps_DeploymentSpec_To_v1_DeploymentSpec, - ) - if err != nil { - return err - } - return nil -} - func Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error { if in.Replicas != nil { out.Replicas = *in.Replicas diff --git a/pkg/apis/apps/v1/register.go b/pkg/apis/apps/v1/register.go index e5567276c11..038d9b35661 100644 --- a/pkg/apis/apps/v1/register.go +++ b/pkg/apis/apps/v1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go index b3b5c389b30..ba3fbe40e17 100644 --- a/pkg/apis/apps/v1beta1/conversion.go +++ b/pkg/apis/apps/v1beta1/conversion.go @@ -28,23 +28,8 @@ import ( ) func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions to handle the *int32 -> int32 - // conversion. A pointer is useful in the versioned type so we can default - // it, but a plain int32 is more convenient in the internal type. These - // functions are the same as the autogenerated ones in every other way. - err := scheme.AddConversionFuncs( - // extensions - // TODO: below conversions should be dropped in favor of auto-generated - // ones, see https://github.com/kubernetes/kubernetes/issues/39865 - Convert_v1beta1_ScaleStatus_To_autoscaling_ScaleStatus, - Convert_autoscaling_ScaleStatus_To_v1beta1_ScaleStatus, - ) - if err != nil { - return err - } - // Add field label conversions for kinds having selectable nothing but ObjectMeta fields. - err = scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"), + if err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"), func(label, value string) (string, string, error) { switch label { case "metadata.name", "metadata.namespace", "status.successful": @@ -52,8 +37,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { default: return "", "", fmt.Errorf("field label not supported for appsv1beta1.StatefulSet: %s", label) } - }) - if err != nil { + }); err != nil { return err } diff --git a/pkg/apis/apps/v1beta2/conversion.go b/pkg/apis/apps/v1beta2/conversion.go index 4476011e583..adf0e1dee05 100644 --- a/pkg/apis/apps/v1beta2/conversion.go +++ b/pkg/apis/apps/v1beta2/conversion.go @@ -31,31 +31,8 @@ import ( ) func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions to handle the *int32 -> int32 - // conversion. A pointer is useful in the versioned type so we can default - // it, but a plain int32 is more convenient in the internal type. These - // functions are the same as the autogenerated ones in every other way. - err := scheme.AddConversionFuncs( - Convert_v1beta2_Deployment_To_apps_Deployment, - Convert_apps_Deployment_To_v1beta2_Deployment, - Convert_apps_DaemonSet_To_v1beta2_DaemonSet, - Convert_v1beta2_DaemonSet_To_apps_DaemonSet, - Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec, - Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec, - // extensions - // TODO: below conversions should be dropped in favor of auto-generated - // ones, see https://github.com/kubernetes/kubernetes/issues/39865 - Convert_v1beta2_ScaleStatus_To_autoscaling_ScaleStatus, - Convert_autoscaling_ScaleStatus_To_v1beta2_ScaleStatus, - Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec, - Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec, - ) - if err != nil { - return err - } - // Add field label conversions for kinds having selectable nothing but ObjectMeta fields. - err = scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"), + if err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"), func(label, value string) (string, string, error) { switch label { case "metadata.name", "metadata.namespace", "status.successful": @@ -63,8 +40,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { default: return "", "", fmt.Errorf("field label not supported for appsv1beta2.StatefulSet: %s", label) } - }) - if err != nil { + }); err != nil { return err } diff --git a/pkg/apis/authentication/v1/conversion.go b/pkg/apis/authentication/v1/conversion.go index fe72f51febe..8088edeb418 100644 --- a/pkg/apis/authentication/v1/conversion.go +++ b/pkg/apis/authentication/v1/conversion.go @@ -19,21 +19,15 @@ package v1 import ( v1 "k8s.io/api/authentication/v1" conversion "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" authentication "k8s.io/kubernetes/pkg/apis/authentication" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - return scheme.AddConversionFuncs() -} - -// Convert_v1_UserInfo_To_authentication_UserInfo is an autogenerated conversion function. +// Convert_v1_UserInfo_To_authentication_UserInfo is defined outside the autogenerated file for use by other API packages func Convert_v1_UserInfo_To_authentication_UserInfo(in *v1.UserInfo, out *authentication.UserInfo, s conversion.Scope) error { return autoConvert_v1_UserInfo_To_authentication_UserInfo(in, out, s) } -// Convert_authentication_UserInfo_To_v1_UserInfo is an autogenerated conversion function. +// Convert_authentication_UserInfo_To_v1_UserInfo is defined outside the autogenerated file for use by other API packages func Convert_authentication_UserInfo_To_v1_UserInfo(in *authentication.UserInfo, out *v1.UserInfo, s conversion.Scope) error { return autoConvert_authentication_UserInfo_To_v1_UserInfo(in, out, s) } diff --git a/pkg/apis/authentication/v1/register.go b/pkg/apis/authentication/v1/register.go index 6dbb52de445..b2f22b9a356 100644 --- a/pkg/apis/authentication/v1/register.go +++ b/pkg/apis/authentication/v1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/authentication/v1beta1/conversion.go b/pkg/apis/authentication/v1beta1/conversion.go deleted file mode 100644 index 51f3adfc712..00000000000 --- a/pkg/apis/authentication/v1beta1/conversion.go +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - return scheme.AddConversionFuncs() -} diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index 715a367ea4c..b0fe3e57ed3 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -42,5 +42,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/authorization/v1/conversion.go b/pkg/apis/authorization/v1/conversion.go deleted file mode 100644 index 2ff5732d6db..00000000000 --- a/pkg/apis/authorization/v1/conversion.go +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1 - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - return scheme.AddConversionFuncs() -} diff --git a/pkg/apis/authorization/v1/register.go b/pkg/apis/authorization/v1/register.go index fa7e00aaf9a..7e7531323ff 100644 --- a/pkg/apis/authorization/v1/register.go +++ b/pkg/apis/authorization/v1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/authorization/v1beta1/conversion.go b/pkg/apis/authorization/v1beta1/conversion.go deleted file mode 100644 index c4013836566..00000000000 --- a/pkg/apis/authorization/v1beta1/conversion.go +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - return scheme.AddConversionFuncs() -} diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 399f20873f1..5e0b1d0d717 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -42,5 +42,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/autoscaling/v1/conversion.go b/pkg/apis/autoscaling/v1/conversion.go index a62a3339475..8aca1c12522 100644 --- a/pkg/apis/autoscaling/v1/conversion.go +++ b/pkg/apis/autoscaling/v1/conversion.go @@ -23,44 +23,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/core" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler, - Convert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler, - Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscalerSpec, - Convert_v1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec, - Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus, - Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus, - Convert_autoscaling_ExternalMetricSource_To_v1_ExternalMetricSource, - Convert_v1_ExternalMetricSource_To_autoscaling_ExternalMetricSource, - Convert_autoscaling_ObjectMetricSource_To_v1_ObjectMetricSource, - Convert_v1_ObjectMetricSource_To_autoscaling_ObjectMetricSource, - Convert_autoscaling_PodsMetricSource_To_v1_PodsMetricSource, - Convert_v1_PodsMetricSource_To_autoscaling_PodsMetricSource, - Convert_autoscaling_ExternalMetricStatus_To_v1_ExternalMetricStatus, - Convert_v1_ExternalMetricStatus_To_autoscaling_ExternalMetricStatus, - Convert_autoscaling_ObjectMetricStatus_To_v1_ObjectMetricStatus, - Convert_v1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus, - Convert_autoscaling_PodsMetricStatus_To_v1_PodsMetricStatus, - Convert_v1_PodsMetricStatus_To_autoscaling_PodsMetricStatus, - Convert_autoscaling_MetricTarget_To_v1_CrossVersionObjectReference, - Convert_v1_CrossVersionObjectReference_To_autoscaling_MetricTarget, - Convert_autoscaling_ResourceMetricStatus_To_v1_ResourceMetricStatus, - Convert_v1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus, - ) - if err != nil { - return err - } - - return nil -} - func Convert_autoscaling_MetricTarget_To_v1_CrossVersionObjectReference(in *autoscaling.MetricTarget, out *autoscalingv1.CrossVersionObjectReference, s conversion.Scope) error { return nil } diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 957d0e99c6a..be246346d7d 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/autoscaling/v2beta1/conversion.go b/pkg/apis/autoscaling/v2beta1/conversion.go index 4446e867915..dc03dfe4281 100644 --- a/pkg/apis/autoscaling/v2beta1/conversion.go +++ b/pkg/apis/autoscaling/v2beta1/conversion.go @@ -21,42 +21,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/autoscaling" core "k8s.io/kubernetes/pkg/apis/core" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_autoscaling_ExternalMetricSource_To_v2beta1_ExternalMetricSource, - Convert_v2beta1_ExternalMetricSource_To_autoscaling_ExternalMetricSource, - Convert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource, - Convert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource, - Convert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource, - Convert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource, - Convert_autoscaling_ExternalMetricStatus_To_v2beta1_ExternalMetricStatus, - Convert_v2beta1_ExternalMetricStatus_To_autoscaling_ExternalMetricStatus, - Convert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus, - Convert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus, - Convert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus, - Convert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus, - Convert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource, - Convert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource, - Convert_autoscaling_MetricTarget_To_v2beta1_CrossVersionObjectReference, - Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_MetricTarget, - Convert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus, - Convert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus, - Convert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler, - Convert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler, - ) - if err != nil { - return err - } - - return nil -} - func Convert_autoscaling_MetricTarget_To_v2beta1_CrossVersionObjectReference(in *autoscaling.MetricTarget, out *autoscalingv2beta1.CrossVersionObjectReference, s conversion.Scope) error { return nil } diff --git a/pkg/apis/autoscaling/v2beta1/conversion_test.go b/pkg/apis/autoscaling/v2beta1/conversion_test.go index 4a1db1a1537..52de8300ebb 100644 --- a/pkg/apis/autoscaling/v2beta1/conversion_test.go +++ b/pkg/apis/autoscaling/v2beta1/conversion_test.go @@ -30,7 +30,7 @@ import ( // TODO(yue9944882): Test nil/empty conversion across all resource types func TestNilOrEmptyConversion(t *testing.T) { scheme := runtime.NewScheme() - assert.NoError(t, addConversionFuncs(scheme)) + assert.NoError(t, RegisterConversions(scheme)) testCases := []struct { obj1 interface{} diff --git a/pkg/apis/autoscaling/v2beta1/register.go b/pkg/apis/autoscaling/v2beta1/register.go index da80b2bef79..b2433d34cf8 100644 --- a/pkg/apis/autoscaling/v2beta1/register.go +++ b/pkg/apis/autoscaling/v2beta1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/batch/v1/conversion.go b/pkg/apis/batch/v1/conversion.go index 7c715542367..873876cbfc0 100644 --- a/pkg/apis/batch/v1/conversion.go +++ b/pkg/apis/batch/v1/conversion.go @@ -28,15 +28,6 @@ import ( ) func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_batch_JobSpec_To_v1_JobSpec, - Convert_v1_JobSpec_To_batch_JobSpec, - ) - if err != nil { - return err - } - return scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("Job"), func(label, value string) (string, string, error) { switch label { diff --git a/pkg/apis/core/v1/conversion.go b/pkg/apis/core/v1/conversion.go index 8a5c1c9cb9f..3f0945b6f5b 100644 --- a/pkg/apis/core/v1/conversion.go +++ b/pkg/apis/core/v1/conversion.go @@ -31,35 +31,8 @@ import ( ) func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_core_Pod_To_v1_Pod, - Convert_core_PodSpec_To_v1_PodSpec, - Convert_v1_PodStatus_To_core_PodStatus, - Convert_core_PodStatus_To_v1_PodStatus, - Convert_core_NodeSpec_To_v1_NodeSpec, - Convert_v1_NodeSpec_To_core_NodeSpec, - Convert_core_ReplicationControllerSpec_To_v1_ReplicationControllerSpec, - Convert_core_ServiceSpec_To_v1_ServiceSpec, - Convert_v1_Pod_To_core_Pod, - Convert_v1_PodSpec_To_core_PodSpec, - Convert_v1_ReplicationControllerSpec_To_core_ReplicationControllerSpec, - Convert_v1_Secret_To_core_Secret, - Convert_v1_ServiceSpec_To_core_ServiceSpec, - Convert_v1_ResourceList_To_core_ResourceList, - Convert_v1_ReplicationController_To_apps_ReplicaSet, - Convert_v1_ReplicationControllerSpec_To_apps_ReplicaSetSpec, - Convert_v1_ReplicationControllerStatus_To_apps_ReplicaSetStatus, - Convert_apps_ReplicaSet_To_v1_ReplicationController, - Convert_apps_ReplicaSetSpec_To_v1_ReplicationControllerSpec, - Convert_apps_ReplicaSetStatus_To_v1_ReplicationControllerStatus, - ) - if err != nil { - return err - } - // Add field conversion funcs. - err = scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("Pod"), + err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("Pod"), func(label, value string) (string, string, error) { switch label { case "metadata.name", diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 80a83b9b289..5812241ea75 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -25,7 +25,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" @@ -34,45 +33,6 @@ import ( "k8s.io/kubernetes/pkg/apis/networking" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_autoscaling_ScaleStatus_To_v1beta1_ScaleStatus, - Convert_v1beta1_ScaleStatus_To_autoscaling_ScaleStatus, - Convert_apps_DeploymentSpec_To_v1beta1_DeploymentSpec, - Convert_v1beta1_DeploymentSpec_To_apps_DeploymentSpec, - Convert_apps_DeploymentStrategy_To_v1beta1_DeploymentStrategy, - Convert_v1beta1_DeploymentStrategy_To_apps_DeploymentStrategy, - Convert_apps_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment, - Convert_v1beta1_RollingUpdateDeployment_To_apps_RollingUpdateDeployment, - Convert_apps_RollingUpdateDaemonSet_To_v1beta1_RollingUpdateDaemonSet, - Convert_v1beta1_RollingUpdateDaemonSet_To_apps_RollingUpdateDaemonSet, - Convert_apps_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec, - Convert_v1beta1_ReplicaSetSpec_To_apps_ReplicaSetSpec, - Convert_v1beta1_NetworkPolicy_To_networking_NetworkPolicy, - Convert_networking_NetworkPolicy_To_v1beta1_NetworkPolicy, - Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngressRule, - Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngressRule, - Convert_v1beta1_NetworkPolicyList_To_networking_NetworkPolicyList, - Convert_networking_NetworkPolicyList_To_v1beta1_NetworkPolicyList, - Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer, - Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer, - Convert_v1beta1_NetworkPolicyPort_To_networking_NetworkPolicyPort, - Convert_networking_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort, - Convert_v1beta1_NetworkPolicySpec_To_networking_NetworkPolicySpec, - Convert_networking_NetworkPolicySpec_To_v1beta1_NetworkPolicySpec, - Convert_v1beta1_IPBlock_To_networking_IPBlock, - Convert_networking_IPBlock_To_v1beta1_IPBlock, - Convert_networking_NetworkPolicyEgressRule_To_v1beta1_NetworkPolicyEgressRule, - Convert_v1beta1_NetworkPolicyEgressRule_To_networking_NetworkPolicyEgressRule, - ) - if err != nil { - return err - } - - return nil -} - func Convert_autoscaling_ScaleStatus_To_v1beta1_ScaleStatus(in *autoscaling.ScaleStatus, out *extensionsv1beta1.ScaleStatus, s conversion.Scope) error { out.Replicas = int32(in.Replicas) out.TargetSelector = in.Selector diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index bd6ce8d9f2f..2b5773c158e 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/pkg/apis/node/v1alpha1/conversion.go b/pkg/apis/node/v1alpha1/conversion.go index 013d2a837bd..5036b62b1f6 100644 --- a/pkg/apis/node/v1alpha1/conversion.go +++ b/pkg/apis/node/v1alpha1/conversion.go @@ -19,17 +19,9 @@ package v1alpha1 import ( v1alpha1 "k8s.io/api/node/v1alpha1" conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" node "k8s.io/kubernetes/pkg/apis/node" ) -func addConversionFuncs(s *runtime.Scheme) error { - return s.AddConversionFuncs( - Convert_v1alpha1_RuntimeClass_To_node_RuntimeClass, - Convert_node_RuntimeClass_To_v1alpha1_RuntimeClass, - ) -} - // Convert_v1alpha1_RuntimeClass_To_node_RuntimeClass must override the automatic // conversion since we unnested the spec struct after v1alpha1 func Convert_v1alpha1_RuntimeClass_To_node_RuntimeClass(in *v1alpha1.RuntimeClass, out *node.RuntimeClass, s conversion.Scope) error { diff --git a/pkg/apis/node/v1alpha1/register.go b/pkg/apis/node/v1alpha1/register.go index b48efda70ac..ae147feb41c 100644 --- a/pkg/apis/node/v1alpha1/register.go +++ b/pkg/apis/node/v1alpha1/register.go @@ -42,5 +42,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addConversionFuncs) + localSchemeBuilder.Register() } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go index 70a2265c8c1..c056dd91ffa 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go @@ -20,23 +20,9 @@ import ( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/json" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps, - Convert_apiextensions_JSON_To_v1_JSON, - Convert_v1_JSON_To_apiextensions_JSON, - ) - if err != nil { - return err - } - return nil -} - func Convert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error { if err := autoConvert_apiextensions_JSONSchemaProps_To_v1_JSONSchemaProps(in, out, s); err != nil { return err diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/register.go index a1b2b60a619..bd6a6ed0066 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/register.go @@ -38,7 +38,7 @@ func Resource(resource string) schema.GroupResource { } var ( - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs) localSchemeBuilder = &SchemeBuilder AddToScheme = localSchemeBuilder.AddToScheme ) @@ -58,5 +58,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion.go index f9951009dc9..e014ce62fd9 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/conversion.go @@ -18,25 +18,11 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/json" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps, - Convert_apiextensions_JSON_To_v1beta1_JSON, - Convert_v1beta1_JSON_To_apiextensions_JSON, - ) - if err != nil { - return err - } - return nil -} - func Convert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in *apiextensions.JSONSchemaProps, out *JSONSchemaProps, s conversion.Scope) error { if err := autoConvert_apiextensions_JSONSchemaProps_To_v1beta1_JSONSchemaProps(in, out, s); err != nil { return err diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go index 97bc5431ccf..ac807211b76 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go @@ -38,7 +38,7 @@ func Resource(resource string) schema.GroupResource { } var ( - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs) localSchemeBuilder = &SchemeBuilder AddToScheme = localSchemeBuilder.AddToScheme ) @@ -58,5 +58,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs) + localSchemeBuilder.Register(addDefaultingFuncs) } diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/conversion.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/conversion.go index 21abdefd5d6..1f647b1567f 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/conversion.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/conversion.go @@ -18,25 +18,9 @@ package v1 import ( conversion "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" example "k8s.io/apiserver/pkg/apis/example" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions to handle the *int32 -> int32 - // conversion. A pointer is useful in the versioned type so we can default - // it, but a plain int32 is more convenient in the internal type. These - // functions are the same as the autogenerated ones in every other way. - err := scheme.AddConversionFuncs( - Convert_example_ReplicaSetSpec_To_v1_ReplicaSetSpec, - Convert_v1_ReplicaSetSpec_To_example_ReplicaSetSpec, - ) - if err != nil { - return err - } - return nil -} - func Convert_example_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *example.ReplicaSetSpec, out *ReplicaSetSpec, s conversion.Scope) error { out.Replicas = new(int32) *out.Replicas = int32(in.Replicas) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/register.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/register.go index 1cb0f5eb8d5..d1543f2fcf3 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/register.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/register.go @@ -50,7 +50,7 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addKnownTypes, addConversionFuncs, addDefaultingFuncs) + localSchemeBuilder.Register(addKnownTypes, addDefaultingFuncs) } // Adds the list of known types to the given scheme. diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/conversion.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/conversion.go index af062b3c635..f271c825929 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/conversion.go @@ -22,23 +22,9 @@ import ( v1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" scheme "k8s.io/client-go/scale/scheme" ) -// addConversions registers conversions between the internal version -// of Scale and supported external versions of Scale. -func addConversionFuncs(scheme *runtime.Scheme) error { - err := scheme.AddConversionFuncs( - Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus, - Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus, - ) - if err != nil { - return err - } - - return nil -} func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas out.Selector = nil diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/register.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/register.go index a684f2d535b..f11fcbd0094 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/register.go +++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addConversionFuncs) + localSchemeBuilder.Register() } diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/conversion.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/conversion.go index f07de6bdae0..35d15c30d4b 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/conversion.go +++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/conversion.go @@ -22,23 +22,9 @@ import ( v1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" scheme "k8s.io/client-go/scale/scheme" ) -// addConversions registers conversions between the internal version -// of Scale and supported external versions of Scale. -func addConversionFuncs(scheme *runtime.Scheme) error { - err := scheme.AddConversionFuncs( - Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus, - Convert_v1beta2_ScaleStatus_To_scheme_ScaleStatus, - ) - if err != nil { - return err - } - - return nil -} func Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(in *scheme.ScaleStatus, out *v1beta2.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas out.Selector = nil diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/register.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/register.go index 88de0893293..5e8a5d20067 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/register.go +++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addConversionFuncs) + localSchemeBuilder.Register() } diff --git a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/conversion.go b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/conversion.go index a775bcc225b..36ef82b92d5 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/conversion.go +++ b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/conversion.go @@ -22,24 +22,9 @@ import ( v1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" scheme "k8s.io/client-go/scale/scheme" ) -// addConversions registers conversions between the internal version -// of Scale and supported external versions of Scale. -func addConversionFuncs(scheme *runtime.Scheme) error { - err := scheme.AddConversionFuncs( - Convert_scheme_ScaleStatus_To_v1_ScaleStatus, - Convert_v1_ScaleStatus_To_scheme_ScaleStatus, - ) - if err != nil { - return err - } - - return nil -} - func Convert_scheme_ScaleStatus_To_v1_ScaleStatus(in *scheme.ScaleStatus, out *v1.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas out.Selector = "" diff --git a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/register.go b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/register.go index b15701c4ff7..4339376c938 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/register.go +++ b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addConversionFuncs) + localSchemeBuilder.Register() } diff --git a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/conversion.go b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/conversion.go index 1b6b9e61037..821eb33d7df 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/conversion.go @@ -22,23 +22,9 @@ import ( v1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" scheme "k8s.io/client-go/scale/scheme" ) -// addConversions registers conversions between the internal version -// of Scale and supported external versions of Scale. -func addConversionFuncs(scheme *runtime.Scheme) error { - err := scheme.AddConversionFuncs( - Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus, - Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus, - ) - if err != nil { - return err - } - - return nil -} func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas out.Selector = nil diff --git a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/register.go b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/register.go index aed1174e023..248a007127d 100644 --- a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/register.go +++ b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/register.go @@ -41,5 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addConversionFuncs) + localSchemeBuilder.Register() } diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/conversion.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/conversion.go index 0c5cfbaf9e7..523e4c01e25 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/conversion.go +++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/conversion.go @@ -19,23 +19,9 @@ package v1beta1 import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/metrics/pkg/apis/custom_metrics" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions - err := scheme.AddConversionFuncs( - Convert_v1beta1_MetricValue_To_custom_metrics_MetricValue, - Convert_custom_metrics_MetricValue_To_v1beta1_MetricValue, - ) - if err != nil { - return err - } - - return nil -} - func Convert_v1beta1_MetricValue_To_custom_metrics_MetricValue(in *MetricValue, out *custom_metrics.MetricValue, s conversion.Scope) error { out.TypeMeta = in.TypeMeta out.DescribedObject = custom_metrics.ObjectReference{ diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/register.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/register.go index 6811f0632ef..ea8e02e8d8d 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/register.go +++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/register.go @@ -35,7 +35,7 @@ func Resource(resource string) schema.GroupResource { var ( // SchemeBuilder points to a list of functions added to Scheme. - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs) + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) localSchemeBuilder = &SchemeBuilder // AddToScheme applies all the stored functions to the scheme. AddToScheme = localSchemeBuilder.AddToScheme diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/conversion.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/conversion.go index d310cd6129a..762025a9fee 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/conversion.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/conversion.go @@ -18,26 +18,9 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/conversion" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/sample-apiserver/pkg/apis/wardle" ) -func addConversionFuncs(scheme *runtime.Scheme) error { - // Add non-generated conversion functions to handle the *int32 -> int32 - // conversion. A pointer is useful in the versioned type so we can default - // it, but a plain int32 is more convenient in the internal type. These - // functions are the same as the autogenerated ones in every other way. - err := scheme.AddConversionFuncs( - Convert_v1alpha1_FlunderSpec_To_wardle_FlunderSpec, - Convert_wardle_FlunderSpec_To_v1alpha1_FlunderSpec, - ) - if err != nil { - return err - } - - return nil -} - // Convert_v1alpha1_FlunderSpec_To_wardle_FlunderSpec is an autogenerated conversion function. func Convert_v1alpha1_FlunderSpec_To_wardle_FlunderSpec(in *FlunderSpec, out *wardle.FlunderSpec, s conversion.Scope) error { if in.ReferenceType != nil { diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go index a2d4c99f535..a47fc84d903 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go @@ -39,7 +39,7 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addKnownTypes, addConversionFuncs, addDefaultingFuncs) + localSchemeBuilder.Register(addKnownTypes, addDefaultingFuncs) } // Adds the list of known types to the given scheme.